From 2a0e78de13bafc845bf728205690225b2d70218e Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 18:18:12 +0800
Subject: [PATCH] feat: 物品报废导出

---
 consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
index 783f3de..bb83f02 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhWarningConfigController.java
@@ -7,6 +7,7 @@
 import com.consum.base.BaseController;
 import com.consum.base.config.WhWarningImportVerifyHandler;
 import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.IdUtil;
 import com.consum.base.pojo.WarnConfImEntity;
 import com.consum.base.pojo.WhWarningConfigParam;
 import com.consum.base.pojo.query.WhWarningConfigQry;
@@ -68,6 +69,10 @@
     @PostMapping("/add")
     public ResponseValue add() throws Exception {
         WhWarningConfigParam param = CommonUtil.getObjFromReqBody(WhWarningConfigParam.class);
+        WhWarningConfigParam param2 = new WhWarningConfigParam();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         String modelConfigStr = param.getModelConfigStr();
         Long baseWarehouseId = param.getBaseWarehouseId();
         Long baseGoodsTemplateId = param.getBaseGoodsTemplateId();
@@ -119,7 +124,7 @@
                 return ResponseValue.error("搴撳瓨涓婇檺涓嶈兘灏忎簬涓嬮檺锛�");
             }
             WhWarningConfig whWarningConfig = new WhWarningConfig();
-            whWarningConfig.setId(NumberGenerator.getLongSequenceNumber());
+            whWarningConfig.setId(IdUtil.generateId());
             whWarningConfig.setWarehouseType(0);
             whWarningConfig.setBaseWarehouseId(baseWarehouseId);
             whWarningConfig.setBaseGoodsTemplateId(baseGoodsTemplateId);
@@ -144,6 +149,10 @@
     @PostMapping("/upd")
     public ResponseValue upd() {
         WhWarningConfig param = CommonUtil.getObjFromReqBody(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         if (param.getId() == null || (param.getUpperLimit() == null && param.getLowerLimit() == null)) {
             return ResponseValue.error("搴撳瓨涓婇檺銆佷笅闄愪笉鑳藉叏涓虹┖锛�");
         }
@@ -160,6 +169,9 @@
     @DeleteMapping("del")
     public ResponseValue delById() {
         WhWarningConfig param = CommonUtil.getObjFromReqBody(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         if (param.getId() == null) {
             return ResponseValue.error("id涓虹┖");
         }
@@ -170,6 +182,9 @@
     @GetMapping("/getList")
     public ResponseValue getConfigList() {
         WhWarningConfigQry param = CommonUtil.getObjFromReq(WhWarningConfigQry.class);
+        WhWarningConfigQry param2 = new WhWarningConfigQry();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
         FinSysTenantUser sysInfo = this.getSysInfo();
         String tenantId = sysInfo.getTenantId();
@@ -184,12 +199,20 @@
     @GetMapping("/getById")
     public ResponseValue getById() {
         WhWarningConfig param = CommonUtil.getObjFromReq(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
         WhWarningConfig whWarningConfig = lWhWarningConfigService.get(param);
         return ResponseValue.success(whWarningConfig);
     }
 
     @GetMapping("/getConfigList")
-    public ResponseValue getConfigList(WhWarningConfig param) {
+    public ResponseValue getWarnConfigList() {
+        WhWarningConfig param = CommonUtil.getObjFromReq(WhWarningConfig.class);
+        WhWarningConfig param2 = new WhWarningConfig();
+        CommonUtil.copyProperties(param, param2);
+        param = param2;
+
         if (param.getBaseWarehouseId() == null || param.getWarehouseType() == null || (param.getBaseGoodsModelsId() == null || param.getBaseGoodsTemplateId() == null)) {
             return ResponseValue.error("缂哄皯蹇呰鍙傛暟");
         }
@@ -277,7 +300,7 @@
                 for (WarnConfImEntity warnConfImEntity : houseModelList) {
                     // 鏂板
                     WhWarningConfig whWarningConfig = new WhWarningConfig();
-                    whWarningConfig.setId(NumberGenerator.getLongSequenceNumber());
+                    whWarningConfig.setId(IdUtil.generateId());
                     whWarningConfig.setWarehouseType(0);
                     whWarningConfig.setBaseWarehouseId(warnConfImEntity.getBaseWarehouseId());
                     whWarningConfig.setBaseGoodsTemplateId(warnConfImEntity.getGoodsTemplateId());
@@ -310,7 +333,7 @@
                         limitEditByModeInfo(whWarningConfig);
                     } else {
                         // 鏂板
-                        whWarningConfig.setId(NumberGenerator.getLongSequenceNumber());
+                        whWarningConfig.setId(IdUtil.generateId());
                         whWarningConfig.setBaseGoodsTemplateId(warnConfImEntity.getGoodsTemplateId());
                         if (whWarningConfig.getBaseGoodsModelsId() == null) {
                             whWarningConfig.setGoodsType(1);

--
Gitblit v1.9.1