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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 8173e60..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
@@ -7,6 +7,7 @@
import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.kernel.model.response.ResponseData;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -130,9 +131,10 @@
@ResponseBody
@RequestMapping("/boardList")
public ResponseData boardList(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) {
+ productionOrderBatchInfoService.findPageBySpec(productionOrderBatchInfoParam);
List<ProductionOrderBatchInfo> list = productionOrderBatchInfoService.list(new QueryWrapper<ProductionOrderBatchInfo>()
.eq("work_order_no", productionOrderBatchInfoParam.getWorkOrderNo())
- .eq("loading_code", productionOrderBatchInfoParam.getLoadingCode())
+ .isNotNull("location_code")
);
return ResponseData.success(0,null,list);
}
@@ -151,6 +153,62 @@
return ResponseData.success();
}
+ @ResponseBody
+ @RequestMapping("/checkLocationCode")
+ public ResponseData checkLocationCode(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) {
+ List<ProductionOrderBatchInfo> list = productionOrderBatchInfoService.list(new QueryWrapper<ProductionOrderBatchInfo>()
+ .eq("material_code", productionOrderBatchInfoParam.getMaterialCode())
+ .eq("work_order_no", productionOrderBatchInfoParam.getWorkOrderNo())
+ .isNotNull("location_code")
+ .eq("state", "鍚�")
+ );
+ return ResponseData.success(list.size());
+ }
+
+ @ResponseBody
+ @RequestMapping("/updateOrderBatchInfo")
+ public ResponseData updateOrderBatchInfo(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) {
+ 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();
+ }
+
+ public List<ProductionOrderBatchInfo> getCheckLocationCodeList(ProductionOrderBatchInfoParam productionOrderBatchInfoParam){
+ List<ProductionOrderBatchInfo> list = productionOrderBatchInfoService.list(new QueryWrapper<ProductionOrderBatchInfo>()
+ .eq("material_code", productionOrderBatchInfoParam.getMaterialCode())
+ .eq("work_order_no", productionOrderBatchInfoParam.getWorkOrderNo())
+ .isNotNull("location_code")
+ );
+ return list;
+ }
}
--
Gitblit v1.9.3