From 0ec6c7ee0b8236cbc6f49a8cc0e466099a09e08d Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 27 十一月 2023 10:25:32 +0800
Subject: [PATCH] 物品报废

---
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java |   58 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index da7ea2e..ed68075 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -4,11 +4,14 @@
 import com.consum.base.core.CodeGeneratorEnum;
 import com.consum.base.core.CodeGeneratorService;
 import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.MapUtils;
 import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.pojo.LWhFormProcureGoodsParams;
+import com.consum.base.core.utils.PageUtil;
+import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
 import com.consum.base.pojo.LWhFormProcureParam;
-import com.consum.base.pojo.LWhProcureModelParams;
-import com.consum.base.pojo.query.FormProcureQryDto;
+import com.consum.base.pojo.LWhProcureModelParam;
+import com.consum.base.pojo.query.FormProcureQry;
 import com.consum.base.pojo.response.FormProcureVO;
 import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
 import com.consum.base.pojo.response.GoodsModelVO;
@@ -23,7 +26,6 @@
 import com.consum.base.service.LWhFormProcureService;
 import com.consum.base.service.LWhGoodsService;
 import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.core.utils.MapUtils;
 import com.consum.model.po.BaseGoodsTemplate;
 import com.consum.model.po.BaseWarehouse;
 import com.consum.model.po.FinSysTenantUser;
@@ -102,13 +104,8 @@
         FinSysTenantUser sysTenantUser = this.getSysInfo();
         String tenantId = sysTenantUser.getTenantId();
         String tenantName = sysTenantUser.getTenantName();
-//        String tenantId = "100";
-//        String tenantName = "娌冲崡鐪佸垎鍏徃";
-        // 鍙兘娣诲姞鏈満鏋勪粨搴撶殑杩涜揣鍗�
-        //??????
-        //
 
-        List<LWhFormProcureGoodsParams> procureGoods = param.getProcureGoods();
+        List<LWhFormProcureGoodsInfoParam> procureGoods = param.getProcureGoods();
         if (CollectionUtils.isEmpty(procureGoods)) {
             return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
         }
@@ -127,7 +124,7 @@
         ArrayList<LWhProcureModel> procureModelList = new ArrayList<>();
 
         for (int i = 0; i < procureGoods.size(); i++) {
-            LWhFormProcureGoodsParams procureGoodT = procureGoods.get(i);
+            LWhFormProcureGoodsInfoParam procureGoodT = procureGoods.get(i);
             Long baseCategoryId = procureGoodT.getBaseCategoryId();
             Long baseGoodsTemplateId = procureGoodT.getBaseGoodsTemplateId();
             String supplier = procureGoodT.getSupplier();
@@ -136,7 +133,7 @@
                 supplierList.add(supplier);
             }
 
-            List<LWhProcureModelParams> models = procureGoodT.getModels();
+            List<LWhProcureModelParam> models = procureGoodT.getModels();
             if (CollectionUtils.isEmpty(models)) {
                 return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
             }
@@ -150,7 +147,7 @@
             procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName());
             procureGood.setSupplier(supplier);
             procureGood.setSort(i);
-            for (LWhProcureModelParams modelT : models) {
+            for (LWhProcureModelParam modelT : models) {
                 Integer counts = modelT.getCounts();
                 if (counts == null || counts <= 0) {
                     return ResponseValue.error("鍨嬪彿鐨勯噰璐暟閲忓彧鑳戒负姝f暣鏁�");
@@ -170,7 +167,7 @@
                 }
                 String modelName = (String) tempGoodsInfo.get("modelname");
                 // 鏌ヨ鍨嬪彿搴撳瓨
-                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
                 LWhProcureModel model = new LWhProcureModel();
                 model.setId(NumberGenerator.getLongSequenceNumber());
                 model.setFromProcureGoodsId(fromProcureGoodsId);
@@ -182,6 +179,7 @@
                 model.setCounts(counts);
                 model.setWorehouseCount(goodsModelNum);
                 model.setSupplier(supplier);
+                model.setTotalAmount(price * counts);
                 procureModelList.add(model);
             }
             procureGoodList.add(procureGood);
@@ -223,19 +221,22 @@
      * @Description 鍒楄〃鏌ヨ
      */
     @ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
-    @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")})
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
+    })
     @GetMapping("/list")
-    public ResponseValue queryFormProcureList(FormProcureQryDto param) {
+    public ResponseValue queryFormProcureList(FormProcureQry param) {
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
-        FinSysTenantUser sysInfo = getSysInfo();
-
-        //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗�
-        //??????
-
-        GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);
+        /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+        FinSysTenantUser sysInfo = this.getSysInfo();
+        String tenantId = sysInfo.getTenantId();
+        if (param.getAgencyId() == null) {
+            param.setAgencyId(Long.valueOf(tenantId));
+        }
+        PageUtil genericPager = lWhFormProcureService.queryFormProcureList(param);
         List<LWhFormProcure> data = genericPager.getDatas();
         ArrayList<FormProcureVO> result = new ArrayList<>();
         if (!CollectionUtils.isEmpty(data)) {
@@ -251,9 +252,9 @@
                     + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
                 Map<String, Object> paramMap = new HashMap<>();
                 paramMap.put("id", item.getId());
-                List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap);
+                List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
                 for (Map<String, Object> map : procureModelList) {
-                    FromProcureTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FromProcureTemplateInfoVO.class);
+                    FromProcureTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromProcureTemplateInfoVO.class);
                     procureTemplateInfoList.add(procureTemplateInfoVO);
                 }
                 fromProcureVO.setFromProcureTemplateInfoList(procureTemplateInfoList);
@@ -268,6 +269,7 @@
         } catch (Exception e) {
             e.printStackTrace();
         }
+        genericPager.setDatas(result);
         return ResponseValue.success(genericPager);
     }
 
@@ -329,6 +331,9 @@
             return ResponseValue.error("閲囪喘鍗昳d涓虹┖");
         }
         LWhFormProcure lWhFormProcure = lWhFormProcureService.get(new LWhFormProcure(id));
+        if (lWhFormProcure == null) {
+            return ResponseValue.error("閲囪喘鍗曚笉瀛樺湪");
+        }
         LWhFormProcureExtendVO lWhFormProcureExtendVO = new LWhFormProcureExtendVO();
         BeanUtils.copyProperties(lWhFormProcure, lWhFormProcureExtendVO);
 
@@ -377,13 +382,14 @@
     @ApiOperation(value = "閲囪喘鍗曟槑缁嗘煡璇�", notes = "閲囪喘鍗曟槑缁嗘煡璇�")
     @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "閲囪喘鍗曟槑缁嗘煡璇�", required = true, dataType = "FormProcureQryDto", paramType = "query")})
     @GetMapping("detail/list")
-    public ResponseValue queryFormProcureDetailList(FormProcureQryDto param) {
+    public ResponseValue queryFormProcureDetailList() {
+        FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
         S_user_core currentUser = this.getCurrentUser();
         if (currentUser == null) {
             return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
         }
 
-        GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(param);
+        GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
         return ResponseValue.success(genericPager);
     }
 }

--
Gitblit v1.9.1