From 1459bdb1184f2aec10dbf987ddf900fea343a54b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 25 六月 2023 15:29:31 +0800
Subject: [PATCH] App出入库问题修改
---
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java | 5 +-
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml | 76 +++++++++++++++++++++-----------------
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java | 6 +-
igds-web/src/main/resources/templates/admin/inout/in-handle.html | 4 +-
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 12 +++---
5 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
index 20b9554..b1f910a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
@@ -92,7 +92,7 @@
*/
public List<InoutRecord> listInoutRecord(Phone35InoutCommonParam param) {
String hql = " from " + InoutRecord.class.getName() + " where companyId =:companyId"
- + " and recordStatus <>:recordStatus1 and recordStatus <>:recordStatus2";
+ + " and recordStatus <>:recordStatus1 ";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", param.getCompanyId());
@@ -141,12 +141,12 @@
* @return
*/
public InoutRecord getInoutRecord(String companyId, String deptId, String id, String intelCard) {
- String hql = " from " + InoutRecord.class.getName() + " where" + " recordStatus <>:recordStatus1 and recordStatus <>:recordStatus2";
+ String hql = " from " + InoutRecord.class.getName() + " where" + " recordStatus <>:recordStatus1 ";
Map<String, Object> args = new HashMap<String, Object>();
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
-
+
if (StringUtils.isNotEmpty(companyId)) {
hql += " and companyId =:companyId";
args.put("companyId", companyId);
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
index 9206fc1..2e7fb3d 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -30,8 +30,9 @@
String str = (String) param.get("depotId");
if (StringUtils.isNotEmpty(str)) {
- hql += " and depotId =:depotId";
- args.put("depotId", str);
+ hql += " and depotIdIn =:depotIdIn or depotIdOut =:depotIdOut";
+ args.put("depotIdIn", str);
+ args.put("depotIdOut", str);
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index e56f1c5..7a05a58 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -77,7 +77,7 @@
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">鍊掍粨鏁伴噺</Property>
- <Property name="displayFormat">#.00</Property>
+ <Property name="displayFormat">#.00KG</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
@@ -88,15 +88,15 @@
<Property name="label">鏇存柊浜�</Property>
</PropertyDef>
<PropertyDef name="dchwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍊掑嚭璐т綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="drhwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍊掑叆璐т綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="bzw">
- <Property/>
+ <Property></Property>
<Property name="label">鍖呰鐗�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("stockChangePR#triggerBzw").getResult()}</Property>
@@ -105,7 +105,7 @@
</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
<Property name="readOnly">true</Property>
</PropertyDef>
@@ -114,7 +114,7 @@
<Property name="label">鏍囧噯鍖呬欢鏁�</Property>
</PropertyDef>
<PropertyDef name="zxzydw">
- <Property/>
+ <Property></Property>
<Property name="label">瑁呭嵏浣滀笟鍗曚綅</Property>
</PropertyDef>
</DataType>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index 83fcfa6..c670b3c 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -73,13 +73,13 @@
<Property></Property>
<Property name="label">绮鏁伴噺</Property>
<Property name="dataType">Double</Property>
- <Property name="displayFormat">#,##0.00 kG</Property>
+ <Property name="displayFormat">#,##0.00 KG</Property>
</PropertyDef>
<PropertyDef name="changeNumber">
<Property></Property>
<Property name="label">鍒掕浆鏁伴噺</Property>
<Property name="dataType">Double</Property>
- <Property name="displayFormat">#,##0.00 kG</Property>
+ <Property name="displayFormat">#,##0.00 KG</Property>
</PropertyDef>
<PropertyDef name="changeTime">
<Property name="dataType">Date</Property>
@@ -95,72 +95,74 @@
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="hwdm">
- <Property/>
+ <Property></Property>
<Property name="label">璐т綅浠ｇ爜</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ccshr">
- <Property/>
+ <Property></Property>
<Property name="label">浠撳偍瀹℃牳浜�</Property>
</PropertyDef>
<PropertyDef name="auditCcsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
<PropertyDef name="InfoCcsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
</PropertyDef>
<PropertyDef name="zjshr">
- <Property/>
+ <Property></Property>
<Property name="label">璐ㄦ瀹℃牳浜�</Property>
</PropertyDef>
<PropertyDef name="auditZjsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
<PropertyDef name="infoZjsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
</PropertyDef>
<PropertyDef name="tjshr">
- <Property/>
+ <Property></Property>
<Property name="label">缁熻瀹℃牳浜�</Property>
</PropertyDef>
<PropertyDef name="auditTjsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
<PropertyDef name="infoTjsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
</PropertyDef>
<PropertyDef name="kjshr">
- <Property/>
+ <Property></Property>
<Property name="label">浼氳瀹℃牳浜�</Property>
</PropertyDef>
<PropertyDef name="auditKjsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
<PropertyDef name="infoKjsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
</PropertyDef>
<PropertyDef name="ldshr">
- <Property/>
+ <Property></Property>
<Property name="label">棰嗗瀹℃牳浜�</Property>
</PropertyDef>
<PropertyDef name="auditLdsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
<PropertyDef name="infoLdsh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -299,6 +301,12 @@
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </DataColumn>
<DataColumn name="depotId">
<Property name="property">depotId</Property>
<Property name="align">center</Property>
@@ -372,11 +380,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">companyId</Property>
<Property name="property">companyId</Property>
<Editor/>
@@ -389,6 +392,21 @@
<AutoFormElement>
<Property name="name">hwdm</Property>
<Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">changeTime</Property>
+ <Property name="property">changeTime</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -417,11 +435,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">changeTime</Property>
- <Property name="property">changeTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">updateTime</Property>
<Property name="property">updateTime</Property>
<Property name="readOnly">true</Property>
@@ -430,11 +443,6 @@
<AutoFormElement>
<Property name="name">czbz</Property>
<Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-handle.html b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
index 27f1dc3..f123de1 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
@@ -166,7 +166,7 @@
</span>
<p>婊¤溅绉伴噸</p>
</li>
- <li id="progress-hand" class="">
+ <li id="progress-hand" class="active">
<span class="rk-step-span">
<img th:src="@{../../static/images/icon-xiehuo.png}"/>
</span>
@@ -520,7 +520,7 @@
var bizType = [[${bizType}]];
//userId
var userId = [[${loginUser.username}]];
- var curUser = [[${loginUser.cname}]];
+ var curUser = [[${loginUser.cname}]];
//鍑哄叆搴撶被鍨�
var type = [[${type}]];
var companyId = [[${loginUser.companyId}]];
--
Gitblit v1.9.3