From 1b72fc0dd1d7004de54ab0886e0323cb1b96198d Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期三, 10 一月 2024 16:38:53 +0800 Subject: [PATCH] 批次上料 --- guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 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..0db2488 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,58 @@ 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.setSpareField1(productionOrderBatchInfoParam.getSpareField1()); + if(batchInfo.getState().equals("鏄�")){ + if(!productionOrderBatchInfoParam.getLoadingCode().equals(batchInfo.getLoadingCode())){ + return ResponseData.success("0"); + }else { + Integer count1 = Integer.parseInt(productionOrderBatchInfoParam.getSpareField1())+Integer.parseInt(batchInfo.getSpareField1()); + byId.setSpareField1(count1.toString()); + } + } + byId.setState("鏄�"); + byId.setLoadingCode(productionOrderBatchInfoParam.getLoadingCode()); + productionOrderBatchInfoService.saveOrUpdate(byId); + return ResponseData.success("1"); + } + + @ResponseBody + @RequestMapping("/resetting") + public ResponseData resetting(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) { + ProductionOrderBatchInfo byId = productionOrderBatchInfoService.getById(productionOrderBatchInfoParam.getId()); + byId.setState("鍚�"); + byId.setSpareField1("0"); + byId.setLoadingCode(""); + 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