From 57351e2e19760732ac00225dfa82a2965e1823b5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 30 六月 2023 14:32:27 +0800
Subject: [PATCH] 优化出入库信息3
---
igds-core/src/main/java/com/ld/igds/view/DepotPR.java | 148 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 103 insertions(+), 45 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 295d0d7..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
@@ -10,11 +10,13 @@
import com.ld.igds.io.request.DepotStatusRequest;
import com.ld.igds.io.response.BaseResponse;
import com.ld.igds.models.*;
+
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
import com.bstek.bdf2.core.business.IUser;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
@@ -23,6 +25,9 @@
import com.ld.igds.common.CoreSerService;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DepotStatus;
+import com.ld.igds.constant.DepotType;
+import com.ld.igds.constant.FoodLevel;
import com.ld.igds.order.ExeOrderService;
import com.ld.igds.order.data.ExeRequest;
import com.ld.igds.util.ContextUtil;
@@ -46,6 +51,63 @@
@Autowired
private ExeOrderService exeOrderService;
+
+ /**
+ * 浠撴埧绫诲瀷-闈炲浗鏍囧畾涔�
+ * ${dorado.getDataProvider("depotPR#triggerDepotType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerDepotType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(DepotType.TYPE_01.getCode(), DepotType.TYPE_01.getMsg()));
+ list.add(new DicTrigger(DepotType.TYPE_02.getCode(), DepotType.TYPE_02.getMsg()));
+ list.add(new DicTrigger(DepotType.TYPE_03.getCode(), DepotType.TYPE_03.getMsg()));
+ list.add(new DicTrigger(DepotType.TYPE_04.getCode(), DepotType.TYPE_04.getMsg()));
+ list.add(new DicTrigger(DepotType.TYPE_99.getCode(), DepotType.TYPE_99.getMsg()));
+ return list;
+ }
+
+ /**
+ * 浠撴埧鐘舵��
+ * ${dorado.getDataProvider("depotPR#triggerDepotStatus").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerDepotStatus() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(DepotStatus.STATUS_1.getCode(), DepotStatus.STATUS_1.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_2.getCode(), DepotStatus.STATUS_2.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_3.getCode(), DepotStatus.STATUS_3.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_4.getCode(), DepotStatus.STATUS_4.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_31.getCode(), DepotStatus.STATUS_31.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_32.getCode(), DepotStatus.STATUS_32.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_33.getCode(), DepotStatus.STATUS_33.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_34.getCode(), DepotStatus.STATUS_34.getMsg()));
+ list.add(new DicTrigger(DepotStatus.STATUS_9.getCode(), DepotStatus.STATUS_9.getMsg()));
+ return list;
+ }
+
+ /**
+ * 绮绛夌骇
+ * ${dorado.getDataProvider("depotPR#triggerFoodLevel").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerFoodLevel() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(FoodLevel.LEVEL_01.getCode(), FoodLevel.LEVEL_01.getMsg()));
+ list.add(new DicTrigger(FoodLevel.LEVEL_02.getCode(), FoodLevel.LEVEL_02.getMsg()));
+ list.add(new DicTrigger(FoodLevel.LEVEL_03.getCode(), FoodLevel.LEVEL_03.getMsg()));
+ list.add(new DicTrigger(FoodLevel.LEVEL_04.getCode(), FoodLevel.LEVEL_04.getMsg()));
+ list.add(new DicTrigger(FoodLevel.LEVEL_05.getCode(), FoodLevel.LEVEL_05.getMsg()));
+ list.add(new DicTrigger(FoodLevel.LEVEL_06.getCode(), FoodLevel.LEVEL_06.getMsg()));
+ return list;
+ }
+
/**
* 鍌ㄧ伯鏂瑰紡
* ${dorado.getDataProvider("depotPR#triggerStoreType").getResult()}
@@ -57,8 +119,24 @@
List<DicTrigger> list = new ArrayList<DicTrigger>();
list.add(new DicTrigger("1", "鏁ｈ鍌ㄧ伯"));
list.add(new DicTrigger("2", "鍖呰鍌ㄧ伯"));
- list.add(new DicTrigger("3", "鍥村寘鏁ｅ瓨"));
+ list.add(new DicTrigger("3", "鍥村寘瀛�"));
list.add(new DicTrigger("9", "鍏朵粬"));
+ return list;
+ }
+
+ /**
+ * 绠＄悊鏂瑰紡
+ * ${dorado.getDataProvider("depotPR#triggerManagerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerManagerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger("01", "鐩村偍"));
+ list.add(new DicTrigger("02", "浠ｅ偍"));
+ list.add(new DicTrigger("03", "绉熶粨"));
+ list.add(new DicTrigger("04", "濮旀墭"));
return list;
}
@@ -133,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
@@ -145,7 +224,7 @@
// depotPR#flushCache
@Expose
public void flushCache() {
- depotService.flushCache(null);
+ depotService.flushCache(ContextUtil.getCompanyId());
}
// depotPR#saveOrUpdate
@@ -163,17 +242,8 @@
if (null == depot.getCompanyId()) {
depotService.saveDepot(depot);
} else {
- depotService.updataDepot(depot);
-
- if (StringUtils.isNotEmpty(depot.getEditTag())) {
- // 琛ㄧず淇敼浜嗕粨搴撶姸鎬�
- if (depot.getEditTag().indexOf("depotStatus") >= 0) {
- this.pullDepotStatus(depot.getCompanyId(), depot.getId(), depot.getDepotStatus());
- }
- }
+ depotService.updateDepot(depot);
}
- //鎭㈠鏍囩
- depot.setEditTag(null);
flushCache();
@@ -247,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