From e6353524bed0f4b50284ca49c133d52c615fb361 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 15 八月 2023 18:57:05 +0800
Subject: [PATCH] 设备管理优化
---
igds-core/src/main/java/com/ld/igds/view/DepotPR.java | 74 ++++++++++++++-----------------------
1 files changed, 28 insertions(+), 46 deletions(-)
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) {
// 鎵ц鎺ㄩ��
--
Gitblit v1.9.3