From 7ed7429feedd93f15210f98659bf7ee29319e297 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:41 +0800
Subject: [PATCH] 熏蒸作业---添加虫害检测单号下拉框
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 4
igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java | 6 +-
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 27 ++++++--
igds-inout/src/main/resources/mapper/InoutCommonMapper.xml | 2
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml | 109 ++++++++++++++++++++++++++++++++++++
5 files changed, 134 insertions(+), 14 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
index 3684625..f1eeed5 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
@@ -19,7 +19,7 @@
import com.ld.igds.util.DateUtil;
/**
- *
+ *
* @author: andy.jia
* @description:
* @version:
@@ -34,7 +34,7 @@
if (null == parameter) {
parameter = new HashMap<String, Object>();
}
-
+
Map<String, Object> args = new HashMap<String, Object>();
// 榛樿鑾峰彇6涓湀鐨勬暟鎹俊鎭�
@@ -65,7 +65,7 @@
}
String countHql = "select count(*) " + hql;
- hql += " order by batchId desc";
+ hql += " order by receiveDate desc";
this.pagingQuery(page, hql, countHql, args);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 200a5de..7b88614 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -397,11 +397,22 @@
}
String loginUser = ContextUtil.getLoginUserCName();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
+ if (StringUtils.isEmpty(data.getRegisterUser())) {
+ data.setRegisterUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getFullWeightUser())) {
+ data.setFullWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
+ data.setEmptyWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getHandleUser())) {
+ data.setHandleUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getCompleteUser())) {
+ data.setCompleteUser(loginUser);
+ }
+
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
}
@@ -414,7 +425,7 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
- if (null != data.getCheckItems()) {
+ if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
data.setCheckUser(loginUser);
}
@@ -628,7 +639,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
@@ -666,7 +677,7 @@
data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
diff --git a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
index c0a1fb2..315bf8b 100644
--- a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
@@ -296,7 +296,7 @@
r.CUSTOMER_ID_,
r.FOOD_VARIETY_,
r.NOTICE_ID_,
- sum (r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
+ sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
from d_inout_record r
where r.COMPANY_ID_ = #{param.companyId}
and r.DEPT_ID_ = #{param.deptId}
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 9e6172d..ce2d3ab 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -536,10 +536,10 @@
<if test="param.foodVariety != null and param.foodVariety != ''">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
<if test="param.id != null and param.id != ''">AND NOTICE_ID_ = #{param.id}</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]> #{param.start}
+ UPDATE_TIME_ <![CDATA[ > ]]> #{param.start}
</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]> #{param.end}
+ UPDATE_TIME_ <![CDATA[ < ]]> #{param.end}
</if>
</select>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
index 8c8e321..e98aacb 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -441,6 +441,73 @@
<Property name="label">鐔忚捀浣滀笟浜哄憳</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtPest">
+ <Property name="creationType">com.ld.igds.models.Pest</Property>
+ <PropertyDef name="batchId">
+ <Property/>
+ <Property name="label">鎵规ID</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property/>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property/>
+ <Property name="label">浠撳簱ID</Property>
+ </PropertyDef>
+ <PropertyDef name="pestMax">
+ <Property name="dataType">int</Property>
+ <Property name="label">鏈�澶氭暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="method">
+ <Property/>
+ <Property name="label">铏妫�娴嬫柟娉�</Property>
+ </PropertyDef>
+ <PropertyDef name="position">
+ <Property/>
+ <Property name="label">鍙戠敓閮ㄤ綅</Property>
+ </PropertyDef>
+ <PropertyDef name="pestType">
+ <Property/>
+ <Property name="label">铏绉嶇被</Property>
+ </PropertyDef>
+ <PropertyDef name="pestLevel">
+ <Property/>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="pestAnalysis">
+ <Property/>
+ <Property name="label">瀹宠櫕鎶楄嵂鎬у垎鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestStart">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐瑰紑濮�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestEnd">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐规埅鑷�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkNum">
+ <Property name="dataType">int</Property>
+ <Property name="label">閲囬泦閫氶亾涓暟</Property>
+ </PropertyDef>
+ <PropertyDef name="receiveDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�娴嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="points">
+ <Property/>
+ <Property name="label">閲囬泦鐐逛俊鎭�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkUser">
+ <Property/>
+ <Property name="label">妫�娴嬩汉</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property/>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<Property name="packages">font-awesome,css-common</Property>
@@ -622,6 +689,7 @@
<AutoFormElement>
<Property name="name">pestBatchId</Property>
<Property name="property">pestBatchId</Property>
+ <Property name="trigger">cddPest</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -951,5 +1019,46 @@
<Property name="items">鐗囧墏,娉ㄥ皠鍓�,涔冲墏,涓稿墏,棰楃矑鍓�,鍏朵粬</Property>
<Property name="autoOpen">true</Property>
</ListDropDown>
+ <CustomDropDown id="cddPest">
+ <ClientEvent name="onOpen">var key = view.get("#dsMain.data:#").get("depotId");
+console.log(key)
+view.get("#dsPest").set("parameter",{depotId:key}).flushAsync();</ClientEvent>
+ <Property name="width">500</Property>
+ <Property name="assignmentMap">pestBatchId=batchId</Property>
+ <Property name="height">500</Property>
+ <Property name="maxHeight">500</Property>
+ <Property name="minHeight">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsPest">
+ <Property name="dataType">[dtPest]</Property>
+ <Property name="dataProvider">pestDataPR#getDataReport</Property>
+ <Property name="pageSize">10</Property>
+ </DataSet>
+ <Container>
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgPest" layoutConstraint="top">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsPest.data:#");
+if(data){
+ view.get("#cddPest").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsPest</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="batchId">
+ <Property name="property">batchId</Property>
+ </DataColumn>
+ <DataColumn name="receiveDate">
+ <Property name="property">receiveDate</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsPest</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3