From 8728429603cdb25b5fc6245915dc829e78d81571 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 31 十月 2023 21:33:53 +0800
Subject: [PATCH] 船运问题
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 6 ++
igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java | 7 ++-
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 1
igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml | 90 +++++++++++++++++++++++++++++++++++++++++----
4 files changed, 92 insertions(+), 12 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index ad0ae3a..990792e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -29,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -551,7 +552,6 @@
data.setDepotId(item.getDepotId());
}
if (data.getDepotId().equals(item.getDepotId())) {
-
inoutParam.setId(data.getRecordId());
} else {
String newId = data.getRecordId() + temp;
@@ -585,11 +585,15 @@
map.put(inoutParam.getId(), inoutParam);
}
InoutParam par;
+ InoutData dat;
for (String key : map.keySet()) {
par = map.get(key);
if (par != null) {
+ dat = new InoutData();
//鏇存柊娴佹按鏁版嵁(鍖呭惈閲嶉噺淇℃伅浠ュ強娴佺▼杩涘害淇℃伅)
inoutService.toComplete(par);
+ BeanUtils.copyProperties(par, dat);
+ inoutService.updateData(dat);
// //鏇存柊浠撳簱搴撳瓨
// if (InoutConstant.TYPE_IN.equals(par.getType())) {
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
index 3083052..85d500c 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
@@ -6,6 +6,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+
import java.util.*;
@Component
@@ -48,10 +49,10 @@
args.put("type", str);
}
- str = (String) param.get("customerId");
+ str = (String) param.get("noticeId");
if (StringUtils.isNotEmpty(str)) {
- hql += " and customerId=:customerId ";
- args.put("customerId", str);
+ hql += " and noticeId=:noticeId ";
+ args.put("noticeId", str);
}
str = (String) param.get("progress");
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index dd23a2f..712285c 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -14,6 +14,7 @@
</PropertyDef>
<PropertyDef name="userId">
<Property name="label">韬唤璇佸彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="noticeId">
<Property name="label">閫氱煡鍗曞彿</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
index 784f6c1..edb1af7 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
@@ -19,7 +19,7 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="customerId">
+ <PropertyDef name="noticeId">
<Property></Property>
<Property name="label">鍙戣揣鍗曚綅</Property>
</PropertyDef>
@@ -112,12 +112,6 @@
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
<Editor/>
@@ -125,8 +119,14 @@
<AutoFormElement>
<Property name="name">customerName</Property>
<Property name="property">customerName</Property>
- <Property name="trigger">ddCustomer</Property>
+ <Property name="trigger">ddNotice</Property>
<Property name="editable">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -375,5 +375,79 @@
</DataGrid>
</Container>
</CustomDropDown>
+ <CustomDropDown id="ddNotice">
+ <ClientEvent name="onOpen">var data = view.get("#dsQuery.data");
+var type = data.get("type");
+if(type){
+ view.get("#dsNotice").set("parameter",{type: type}).flushAsync();
+}else{
+ $alert("璇峰厛閫夋嫨鍑哄叆搴撶被鍨�")
+}
+</ClientEvent>
+ <Property name="minHeight">400</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
+ <Property name="minWidth">1000</Property>
+ <Property name="autoOpen">true</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsNotice">
+ <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
+ <Property name="dataType">[dtNoticeDto]</Property>
+ <Property name="parameter"/>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key3">
+ <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key3.value");
+var type = "${request.getParameter('type')}";
+view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsNotice</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">customerName</Property>
+ <Property name="width">240</Property>
+ </DataColumn>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">300</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3