From 7e2a72d1a9c73320b0f4b7e7a580372f7af55e04 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 16 八月 2023 10:28:24 +0800
Subject: [PATCH] 损益管理页面优化
---
igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml | 51 ++++--------
igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java | 9 --
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java | 4
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml | 20 -----
igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java | 14 ---
igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java | 20 +---
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java | 16 +--
igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java | 22 -----
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 32 -------
9 files changed, 35 insertions(+), 153 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
index 559f11f..9479b46 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HLossOverService.java
@@ -84,9 +84,6 @@
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
- if ("OVER".equals(data.getType())) {
- data.setAmount(0 - data.getAmount());
- }
try {
if (null == data.getId()) {
@@ -104,14 +101,12 @@
if (data.getSubmitTime().before(curDate)) {
data.setSubmitTime(curDate);
}
- String id = createId(data.getSubmitTime(), data.getCompanyId(), data.getHwdm());
+ String id = createId(data.getSubmitTime(), data.getCompanyId(), data.getType());
// String id = addInoutDataByLossOver(data);
- data.setCzbz("i");
data.setId(id);
session.save(data);
} else {
- data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
@@ -202,7 +197,7 @@
return this.query(hql, args);
}
- public String createId(Date date, String companyId, String freightId) {
+ public String createId(Date date, String companyId, String type) {
// 鏃堕棿鎴虫爣绛�
String timeKey = DateFormatUtils.format(date, "yyyyMMdd");
@@ -212,17 +207,16 @@
String cacheId = (String) redisUtil.get(cacheKey);
- if (null != cacheId && cacheId.indexOf(freightId + timeKey) >= 0) {
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
String temp = cacheId.substring(cacheId.length() - 3);
Integer i = Integer.valueOf(temp);
- cacheId = freightId + timeKey + String.format("%03d", ++i);
+ cacheId = timeKey + String.format("%03d", ++i);
} else {
Map<String, Object> args = new HashMap<>();
- args.put("timeKey", freightId + timeKey + "%");
+ args.put("timeKey", timeKey + "%");
List<InoutLossOver> result = getMaxId(args);
-
if (null == result || result.size() == 0) {
- cacheId = freightId + timeKey + "001";
+ cacheId = timeKey + "001";
} else {
int max = 0;
int num;
@@ -230,7 +224,7 @@
num = Integer.parseInt(inoutLossOver.getId().substring(inoutLossOver.getId().length() - 3));
max = Math.max(max, num);
}
- cacheId = freightId + timeKey + String.format("%03d", ++max);
+ cacheId = timeKey + String.format("%03d", ++max);
}
}
// 鏇存柊缂撳瓨
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 7176354..c26e741 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
@@ -61,13 +61,11 @@
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
- if (null == data.getCzbz()) {
+ if (null == data.getId()) {
String id = createId(data.getChangeDate(), ContextUtil.getCompanyId());
data.setId(id);
- data.setCzbz("i");
session.save(data);
} else {
- data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
index 6a8c3bc..2c4043f 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
@@ -79,12 +79,10 @@
try {
if (null == data.getId()) {
- String id = createId(data.getChangeTime(), ContextUtil.getCompanyId(), data.getHwdm());
+ String id = createId(data.getChangeTime(), ContextUtil.getCompanyId());
data.setId(id);
- data.setCzbz("i");
session.save(data);
} else {
- data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
@@ -141,7 +139,7 @@
return this.query(hql, args);
}
- public String createId(Date date, String companyId, String freightId) {
+ public String createId(Date date, String companyId) {
// 鏃堕棿鎴虫爣绛�
String timeKey = DateFormatUtils.format(date, "yyyyMMdd");
@@ -151,18 +149,18 @@
String cacheId = (String) redisUtil.get(cacheKey);
- if (null != cacheId && cacheId.indexOf(freightId + timeKey) >= 0) {
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
String temp = cacheId.substring(cacheId.length() - 3);
Integer i = Integer.valueOf(temp);
i++;
- cacheId = freightId + timeKey + String.format("%03d", i);
+ cacheId = timeKey + String.format("%03d", i);
} else {
Map<String, Object> args = new HashMap<>();
- args.put("timeKey", freightId + timeKey + "%");
+ args.put("timeKey", timeKey + "%");
List<InoutVarietyChange> result = getMaxId(args);
if (null == result || result.size() == 0) {
- cacheId = freightId + timeKey + "001";
+ cacheId = timeKey + "001";
} else {
int max = 0;
int num;
@@ -170,7 +168,7 @@
num = Integer.parseInt(varietyChange.getId().substring(varietyChange.getId().length() - 3));
max = Math.max(max, num);
}
- cacheId = freightId + timeKey + String.format("%03d", ++max);
+ cacheId = timeKey + String.format("%03d", ++max);
}
}
// 鏇存柊缂撳瓨
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
index ceb8ba6..a729d33 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
@@ -31,9 +31,8 @@
<Property name="label">绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="submitTime">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鐧昏鏃堕棿</Property>
- <Property name="displayFormat">Y-m-d H:i</Property>
+ <Property name="dataType">Date</Property>
+ <Property name="label">涓氬姟鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
@@ -65,10 +64,6 @@
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
- </PropertyDef>
- <PropertyDef name="hwdm">
- <Property></Property>
- <Property name="label">璐т綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="rkjz">
<Property name="dataType">double</Property>
@@ -184,11 +179,6 @@
<PropertyDef name="infoLdsh">
<Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <Property></Property>
- <Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -407,13 +397,13 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">companyId</Property>
- <Property name="property">companyId</Property>
+ <Property name="name">submitTime</Property>
+ <Property name="property">submitTime</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">submitTime</Property>
- <Property name="property">submitTime</Property>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -426,16 +416,13 @@
<Property name="property">amount</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwdm</Property>
- <Property name="property">hwdm</Property>
- <Editor/>
- </AutoFormElement>
+ <Label>
+ <Property name="text">璇存槑锛氭崯婧㈤噸閲忓湪鎹熻�楅〉闈㈠拰婧㈠嚭椤甸潰鍧囧～姝ｆ暟</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ <Property name="padding-left">80px</Property>
+ </Property>
+ </Label>
<AutoFormElement>
<Property name="name">rkjz</Property>
<Property name="property">rkjz</Property>
@@ -482,11 +469,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">syyy</Property>
- <Property name="property">syyy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">updateUser</Property>
<Property name="property">updateUser</Property>
<Editor/>
@@ -496,9 +478,10 @@
<Property name="property">updateTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">syyy</Property>
+ <Property name="property">syyy</Property>
+ <Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
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 d01cc51..feb02bb 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
@@ -90,14 +90,6 @@
<Property></Property>
<Property name="label">鏇存柊浜�</Property>
</PropertyDef>
- <PropertyDef name="dchwdm">
- <Property></Property>
- <Property name="label">鍊掑嚭璐т綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="drhwdm">
- <Property></Property>
- <Property name="label">鍊掑叆璐т綅浠ｇ爜</Property>
- </PropertyDef>
<PropertyDef name="bzw">
<Property></Property>
<Property name="label">鍖呰鐗�</Property>
@@ -106,11 +98,6 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <Property></Property>
- <Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="bzbjs">
<Property name="dataType">Integer</Property>
@@ -348,8 +335,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">companyId</Property>
- <Property name="property">companyId</Property>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -363,23 +350,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dchwdm</Property>
- <Property name="property">dchwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">drhwdm</Property>
- <Property name="property">drhwdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
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 55e88e2..d14146f 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
@@ -96,11 +96,6 @@
<Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
- <PropertyDef name="hwdm">
- <Property></Property>
- <Property name="label">璐т綅浠ｇ爜</Property>
- <Property name="required">true</Property>
- </PropertyDef>
<PropertyDef name="ccshr">
<Property></Property>
<Property name="label">浠撳偍瀹℃牳浜�</Property>
@@ -160,11 +155,6 @@
<PropertyDef name="infoLdsh">
<Property></Property>
<Property name="label">瀹℃牳璇存槑</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <Property></Property>
- <Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -382,18 +372,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">companyId</Property>
- <Property name="property">companyId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">approvalId</Property>
<Property name="property">approvalId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwdm</Property>
- <Property name="property">hwdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java b/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java
index 694bfdb..0d12bb2 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutLossOver.java
@@ -42,9 +42,6 @@
@PropertyDef(label = "鎵�灞炰粨搴�")
private String depotId;
- @Column(name = "hwdm", length = 50)
- @PropertyDef(label = "璐т綅浠ｇ爜")
- private String hwdm;
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "绫诲瀷", description = "鎹熻��/婧㈠嚭")
@@ -92,21 +89,6 @@
@PropertyDef(label = "閲嶉噺", description = "鎹熸孩鏁伴噺KG锛涙崯鑰椾负姝ｆ暟锛屾孩浣欎负璐熸暟")
private Double amount;
-// @PropertyDef(label = "鍏朵腑锛氭垚璐т綅鍓嶆崯鑰�(鍏枻)" )
-// @Column(name = "qzchwqsh", precision = 20, scale = 6)
-// private double qzchwqsh;
-//
-// @PropertyDef(label = "鍏朵腑姘存潅鍑忛噺(鍏枻)" )
-// @Column(name = "qzszkl", precision = 20, scale = 6)
-// private double qzszkl;
-//
-// @PropertyDef(label = "鍏朵腑锛氳嚜鐒舵崯鑰楀畾棰�(鍏枻)" )
-// @Column(name = "qzzrshde", precision = 20, scale = 6)
-// private double qzzrshde;
-//
-// @PropertyDef(label = "瓒呰�楁暟閲�(鍏枻)" )
-// @Column(name = "chsl", precision = 20, scale = 6)
-// private double chsl;
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父", description = "0锛氭甯� 1锛氫笉姝ｅ父")
@Column(name = "sysfzc", length = 1)
@@ -187,9 +169,5 @@
@Column(name = "UPDATE_USER_", length = 50)
@PropertyDef(label = "鏇存柊浜�")
private String updateUser;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁d:鍒犻櫎鏁版嵁")
- @Column(name = "czbz", length = 1)
- private String czbz;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
index bba89f9..fcb5dc7 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
@@ -67,10 +67,6 @@
@PropertyDef(label = "鍊掍粨鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double number = 0.0;
- @Column(name = "czbz", length = 1)
- @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁 d:鍒犻櫎鏁版嵁")
- private String czbz;
-
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date updateTime;
@@ -78,15 +74,7 @@
@Column(name = "UPDATE_USER_", length = 50)
@PropertyDef(label = "鏇存柊浜�")
private String updateUser;
-
- @Column(name = "dchwdm", length = 30)
- @PropertyDef(label = "鍊掑嚭璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
- private String dchwdm;
-
- @Column(name = "drhwdm", length = 30)
- @PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
- private String drhwdm;
-
+
@Column(name = "bzw", length = 1)
@PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚� 2锛氱紪缁囪 3锛氭暎瑁� 9锛氬叾浠�")
private String bzw;
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
index 37f168b..c641f13 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
@@ -31,10 +31,6 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "hwdm", length = 30)
- @PropertyDef(label = "璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
- private String hwdm;
-
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鍒嗗簱缂栫爜")
private String deptId;
@@ -140,11 +136,6 @@
@Column(name = "INFO_LDSH_", length = 200)
@PropertyDef(label = "瀹℃牳璇存槑")
private String infoLdsh;
-
- @Column(name = "czbz", length = 1)
- @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁 d:鍒犻櫎鏁版嵁")
- private String czbz;
-
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
--
Gitblit v1.9.3