From e0fac38b26845f25de479783e0c76cf12a5311e0 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 一月 2024 10:31:28 +0800
Subject: [PATCH] 修改数据采集

---
 guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java
index 5d20245..4fff3f5 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java
@@ -168,11 +168,35 @@
     @ResponseBody
     @RequestMapping("/updateOrderBatchInfo")
     public ResponseData updateOrderBatchInfo(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) {
-        Long id = getCheckLocationCodeList(productionOrderBatchInfoParam).get(0).getId();
-        ProductionOrderBatchInfo byId = productionOrderBatchInfoService.getById(id);
-        byId.setState("鏄�");
-        byId.setLoadingCode(productionOrderBatchInfoParam.getLoadingCode());
-        byId.setSpareField1(productionOrderBatchInfoParam.getSpareField1());
+        List<ProductionOrderBatchInfo> checkLocationCodeList = getCheckLocationCodeList(productionOrderBatchInfoParam);
+        ProductionOrderBatchInfo batchInfo = checkLocationCodeList.get(0);
+        ProductionOrderBatchInfo byId = productionOrderBatchInfoService.getById(batchInfo.getId());
+        byId.setQuantity(productionOrderBatchInfoParam.getQuantity());
+        byId.setResidueQuantity(productionOrderBatchInfoParam.getResidueQuantity());
+        if(batchInfo.getStatus().equals("鏄�")){
+            if(!productionOrderBatchInfoParam.getBatch().equals(batchInfo.getBatch())){
+                return  ResponseData.success("0");
+            }else {
+                Integer count1 = productionOrderBatchInfoParam.getQuantity()+batchInfo.getQuantity();
+                Integer count2 = batchInfo.getResidueQuantity()+productionOrderBatchInfoParam.getResidueQuantity();
+                byId.setQuantity(count1);
+                byId.setResidueQuantity(count2);
+            }
+        }
+        byId.setStatus("鏄�");
+        byId.setBatch(productionOrderBatchInfoParam.getBatch());
+        productionOrderBatchInfoService.saveOrUpdate(byId);
+        return ResponseData.success("1");
+    }
+
+    @ResponseBody
+    @RequestMapping("/resetting")
+    public ResponseData resetting(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) {
+        ProductionOrderBatchInfo byId = productionOrderBatchInfoService.getById(productionOrderBatchInfoParam.getId());
+        byId.setStatus("鍚�");
+        byId.setQuantity(0);
+        byId.setResidueQuantity(0);
+        byId.setBatch("");
         productionOrderBatchInfoService.saveOrUpdate(byId);
         return ResponseData.success();
     }

--
Gitblit v1.9.3