From 0efbf246a22f7331cf2e16bd659caea22a494102 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 29 五月 2023 12:05:48 +0800
Subject: [PATCH] 调整模块货位和库存2
---
igds-core/src/main/java/com/ld/igds/data/SimpleDepot.java | 40 ++++++++
igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java | 10 +-
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 2
igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml | 39 ++++---
igds-core/src/main/java/com/ld/igds/constant/RedisConst.java | 2
igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java | 43 ++++++++
igds-core/src/main/java/com/ld/igds/view/DepotPR.java | 74 +++++---------
igds-core/src/main/java/com/ld/igds/view/service/HDepotService.java | 34 ------
8 files changed, 142 insertions(+), 102 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 08ca40d..8ba9a5d 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -19,6 +19,7 @@
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.dom4j.CDATA;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -51,7 +52,6 @@
@Override
public List<Depot> getCacheDepotList(String companyId) {
-
String patten = RedisConst.buildKey(companyId, RedisConst.KEY_DEPOT);
Set<String> keys = redisUtil.keys(patten);
diff --git a/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java b/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
index 69df1c0..bb7f5cc 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/DepotStatus.java
@@ -7,12 +7,12 @@
STATUS_1("1", "绌轰粨"),
STATUS_2("2", "鍏ュ簱涓�"),
- STATUS_3("3", "婊′粨"),
+ STATUS_3("3", "灏佷粨"),
STATUS_4("4", "鍑哄簱涓�"),
- STATUS_31("31", "婊′粨-姘旇皟涓�"),
- STATUS_32("32", "婊′粨-鐔忚捀涓�"),
- STATUS_33("33", "婊′粨-閫氶涓�"),
- STATUS_34("34", "婊′粨-娓╂帶涓�"),
+ STATUS_31("31", "灏佷粨-姘旇皟涓�"),
+ STATUS_32("32", "灏佷粨-鐔忚捀涓�"),
+ STATUS_33("33", "灏佷粨-閫氶涓�"),
+ STATUS_34("34", "灏佷粨-娓╂帶涓�"),
STATUS_9("9", "鍏朵粬");
private String code;
diff --git a/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java b/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java
index 0451dda..a8ac206 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java
@@ -72,7 +72,7 @@
/**
* 浠撳簱鍒楄〃KEY
*/
- public static final String KEY_DEPOT = "KEY_DEPOT_DATA";
+ public static final String KEY_DEPOT = "KEY_DEPOT";
/**
* 浠撳簱鍙傛暟鍒楄〃KEY
diff --git a/igds-core/src/main/java/com/ld/igds/data/SimpleDepot.java b/igds-core/src/main/java/com/ld/igds/data/SimpleDepot.java
new file mode 100644
index 0000000..c97c1de
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/data/SimpleDepot.java
@@ -0,0 +1,40 @@
+package com.ld.igds.data;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+/**
+ * @Desc: 鐢ㄤ簬浣滀负涓嬫媺妗嗙殑鏁版嵁灏佽锛屽彧鍖呭惈鍩虹淇℃伅
+ * @author: andy.jia
+ * @update-time: 2023/5/29 11:58
+ */
+@Data
+public class SimpleDepot {
+
+ @PropertyDef(label = "璐т綅缂栧彿")
+ private String id;
+
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @PropertyDef(label = "鎵�灞炲垎搴�")
+ private String deptId;
+
+ @PropertyDef(label = "璐т綅鍚嶇О")
+ private String name;
+
+ @PropertyDef(label = "鎵�灞炰粨鎴�")
+ private String buildingId;
+
+ @PropertyDef(label = "鎵�灞炲粧闂�")
+ private String granaryId;
+
+ @PropertyDef(label = "浠撳簱绫诲瀷", description = "鏍规嵁鍥芥爣閰嶇疆绫诲瀷锛屽钩鎴夸粨銆佺珛绛掍粨銆佹祬鍦嗕粨銆佸偍娌圭綈")
+ private String depotType;
+
+ @PropertyDef(label = "浠撳簱鐘舵��", description = "涓庡簱瀛樿〃鍏宠仈锛岄�氳繃搴撳瓨鍙樻洿")
+ private String depotStatus;
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
index 5859990..05a67d6 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotPR.java
@@ -50,8 +50,8 @@
private RemoteManager remoteManager;
@Autowired
private ExeOrderService exeOrderService;
-
-
+
+
/**
* 浠撴埧绫诲瀷-闈炲浗鏍囧畾涔�
* ${dorado.getDataProvider("depotPR#triggerDepotType").getResult()}
@@ -68,7 +68,7 @@
list.add(new DicTrigger(DepotType.TYPE_99.getCode(), DepotType.TYPE_99.getMsg()));
return list;
}
-
+
/**
* 浠撴埧鐘舵��
* ${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()}
@@ -89,7 +89,7 @@
list.add(new DicTrigger(DepotStatus.STATUS_9.getCode(), DepotStatus.STATUS_9.getMsg()));
return list;
}
-
+
/**
* 绮绛夌骇
* ${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()}
@@ -123,7 +123,7 @@
list.add(new DicTrigger("9", "鍏朵粬"));
return list;
}
-
+
/**
* 绠＄悊鏂瑰紡
* ${dorado.getDataProvider("depotPR#triggerManagerType").getResult()}
@@ -211,8 +211,9 @@
// ${dorado.getDataProvider("depotPR#getAllCache").getResult()}
@DataProvider
public List<Depot> getAllCache(String name) {
- return depotService.getAllCache(name, null);
+ return depotService.getAllCache(name, ContextUtil.getCompanyId());
}
+
// depotPR#ajaxGetAllCache
@Expose
@@ -223,7 +224,7 @@
// depotPR#flushCache
@Expose
public void flushCache() {
- depotService.flushCache(null);
+ depotService.flushCache(ContextUtil.getCompanyId());
}
// depotPR#saveOrUpdate
@@ -241,14 +242,7 @@
if (null == depot.getCompanyId()) {
depotService.saveDepot(depot);
} else {
- depotService.updataDepot(depot);
-// TODO
-// if (StringUtils.isNotEmpty(depot.getEditTag())) {
-// // 琛ㄧず淇敼浜嗕粨搴撶姸鎬�
-// if (depot.getEditTag().indexOf("depotStatus") >= 0) {
-// this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
-// }
-// }
+ depotService.updateDepot(depot);
}
flushCache();
@@ -323,38 +317,26 @@
depotService.updateFreq(freq);
}
- public void updateByStore(DepotStore data) {
- depotService.updateByStore(data);
- }
+ public void updateByStore(DepotStore data) throws Exception {
- /**
- * 鏍规嵁浠撳簱鍒濆鍖栦竴鏉″嚭鍏ュ簱鐨勬祦姘磋褰�
- * public void initDepotInoutRecord(Depot depot) {
- * InoutRecord data = new InoutRecord();
- * if (StringUtils.isEmpty(depot.getCompanyId())) {
- * depot.setCompanyId(ContextUtil.getCompanyId());
- * }
- * data.setId(depot.getCompanyId() + "-" + depot.getId() + "-"
- * + DateFormatUtils.format(new Date(), "yyyyMMdd"));
- * data.setCheckStatus("PASS");
- * data.setCompanyId(depot.getCompanyId());
- * data.setCompleteTime(new Date());
- * data.setCompleteUser(ContextUtil.getLoginUserCName());
- * data.setDepotId(depot.getId());
- * data.setDeptId(depot.getDeptId());
- * data.setFoodVariety(depot.getFoodVariety());
- * data.setFoodYear(DateFormatUtils.format(new Date(), "yyyy"));
- * data.setProgress("RECORD");
- * data.setRecordStatus("ADD");
- * data.setType("NONE");
- * if (depot.getStorageReal() == null) {
- * data.setCurStorage(0);
- * } else {
- * data.setCurStorage(depot.getStorageReal());
- * }
- * depotService.initInoutRecord(data);
- * }
- */
+ Depot depot = depotService.getDepotById(data.getCompanyId(), data.getDepotId());
+
+ if (null == depot) return;
+
+ depot.setStorageReal(data.getStorageReal());
+ depot.setDepotStatus(data.getDepotStatus());
+ depot.setFoodLevel(data.getFoodLevel());
+ depot.setFoodLocation(data.getFoodLocation());
+ depot.setFoodVariety(data.getFoodVariety());
+ depot.setFoodType(data.getFoodType());
+ depot.setFoodYear(data.getFoodYear());
+ if (null != data.getStoreDate()) {
+ depot.setStoreDate(data.getStoreDate());
+ }
+
+
+ depotService.updateDepot(depot);
+ }
public String pullDepotStatus(String companyId, String depotId, String status) {
// 鎵ц鎺ㄩ��
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
index a32b34c..5fc91aa 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -125,7 +125,7 @@
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-view.get("#uaAction").set("parameter",data).execute(function(result){
+view.get("#uaAction").execute(function(result){
if(result){
$alert(result);
}else{
@@ -204,7 +204,7 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
<Property name="style">
<Property name="color">red</Property>
<Property name="font-size">12px</Property>
@@ -216,9 +216,10 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -228,9 +229,10 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -241,7 +243,8 @@
<Label>
<Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱鏁伴噺涔嬪拰</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -252,7 +255,8 @@
<Label>
<Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱缁撶畻鏁伴噺涔嬪拰</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -261,9 +265,10 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=绌轰粨/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨/鍑哄簱涓紝蹇呭～</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -272,9 +277,10 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～銆傜涓�杞﹀叆浠撴椂闂�</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～銆傜涓�杞﹀叆浠撴椂闂�</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -285,7 +291,8 @@
<Label>
<Property name="text">璐т綅鐘舵��=绌轰粨锛屽繀濉�傛渶鍚庝竴杞︾伯椋熷嚭浠撴椂闂�</Property>
<Property name="style">
- <Property name="color">blue</Property>
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -294,9 +301,10 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨锛屽彲濉�</Property>
<Property name="style">
<Property name="color">blue</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement>
@@ -305,9 +313,10 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+ <Property name="text">璐т綅鐘舵��=灏佷粨锛屽彲濉�</Property>
<Property name="style">
<Property name="color">blue</Property>
+ <Property name="font-size">12px</Property>
</Property>
</Label>
<AutoFormElement layoutConstraint="colSpan:2">
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java b/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
index 7bde68b..7b0f58e 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStorePR.java
@@ -4,6 +4,7 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.constant.DepotStatus;
import com.ld.igds.models.DepotStore;
import com.ld.igds.view.service.HDepotStoreService;
import org.springframework.stereotype.Component;
@@ -49,9 +50,43 @@
* @param data
*/
@DataResolver
- public void saveDepotStore(DepotStore data) {
-
- //TODO 鏍规嵁椤甸潰璇存槑澧炲姞淇濆瓨鍓嶉獙璇� 2023骞�5鏈�27鏃� 18:53:56
+ public String saveDepotStore(DepotStore data) throws Exception {
+
+ //濡傛灉浠撳簱鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓�
+ if (DepotStatus.STATUS_2.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_3.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_4.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_31.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_32.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_33.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_34.getCode().equals(data.getDepotStatus())) {
+
+ if (null == data.getFoodYear()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝鏀惰揣骞村害涓嶈兘涓虹┖";
+
+ if (null == data.getCountry()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝鍥藉埆涓嶈兘涓虹┖";
+
+ if (null == data.getFoodLocation()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝绮浜у湴涓嶈兘涓虹┖";
+
+ if (null == data.getFoodLocation()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝绮浜у湴涓嶈兘涓虹┖";
+
+ if (null == data.getStoreDate()) return "璐т綅鐘舵��=灏佷粨/鍏ュ簱涓�/鍑哄簱涓紝鍏ュ簱鏃堕棿涓嶅彲涓虹┖";
+ }
+
+ //璐т綅鐘舵��=灏佷粨/鍑哄簱涓紝蹇呭～
+ if (DepotStatus.STATUS_3.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_4.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_31.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_32.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_33.getCode().equals(data.getDepotStatus()) ||
+ DepotStatus.STATUS_34.getCode().equals(data.getDepotStatus())) {
+
+ if (null == data.getFullDate()) return "璐т綅鐘舵��=灏佷粨/鍑哄簱涓紝灏佷粨鏃堕棿涓嶅彲涓虹┖";
+ }
+
+ //璐т綅鐘舵��=绌轰粨锛屽繀濉�傛渶鍚庝竴杞︾伯椋熷嚭浠撴椂闂�
+ if (DepotStatus.STATUS_1.getCode().equals(data.getDepotStatus())) {
+ if (null == data.getOutDate()) return "璐т綅鐘舵��=绌轰粨锛屽嚭浠撳畬鎴愭椂闂翠笉鍙负绌�";
+ }
depotStoreService.saveDepotStore(data);
@@ -60,6 +95,8 @@
//杩滅▼鍚屾鐘舵��
depotPR.pullDepotStatus(data.getCompanyId(), data.getDepotId(), data.getDepotStatus());
+
+ return null;
}
/**
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDepotService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDepotService.java
index 55fdefd..b7f8469 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDepotService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDepotService.java
@@ -97,6 +97,8 @@
Map<String, Object> args = new HashMap<>();
args.put("companyId", companyId);
list = this.getData(args);
+
+
coreCommonService.setCacheDepot(list, companyId);
} catch (Exception e) {
e.printStackTrace();
@@ -147,7 +149,7 @@
*
* @throws Exception
*/
- public void updataDepot(Depot depot) throws Exception {
+ public void updateDepot(Depot depot) throws Exception {
Session session = this.getSessionFactory().openSession();
try {
flushCache(depot.getCompanyId());
@@ -253,15 +255,6 @@
coreCommonService.setCacheDepotConf(list, companyId);
}
-// public void initInoutRecord(InoutRecord inoutRecord) {
-// Session session = this.getSessionFactory().openSession();
-// try {
-// session.saveOrUpdate(inoutRecord);
-// } finally {
-// session.flush();
-// session.close();
-// }
-// }
public void updateFreq(String freq) {
String sql = "UPDATE D_DEPOT_CONF SET GRAIN_FREQ_ =:freq WHERE COMPANY_ID_ =:companyId";
@@ -306,27 +299,6 @@
if (null == list || list.isEmpty()) return;
for (Depot depot : list) {
ContextUtil.updateSubDept(depot.getId(), depot.getDeptId());
- }
- }
-
- public void updateByStore(DepotStore depotStore) {
- String sql = "UPDATE D_DEPOT SET STORAGE_REAL_ =:storageReal,DEPOT_STATUS_=:depotStatus ";
- Session session = this.getSessionFactory().openSession();
- String companyId = depotStore.getCompanyId();
- if (null == companyId) {
- companyId = ContextUtil.getCompanyId();
- }
- try {
- sql += " WHERE COMPANY_ID_ =:companyId AND ID_=:id";
- SQLQuery query = session.createSQLQuery(sql);
- query.setDouble("storageReal", depotStore.getStorageReal());
- query.setString("depotStatus", depotStore.getDepotStatus());
- query.setString("companyId", companyId);
- query.setString("id", depotStore.getDepotId());
- query.executeUpdate();
- } finally {
- session.flush();
- session.close();
}
}
}
--
Gitblit v1.9.3