批次上料

懒羊羊

2024-01-11 be26d5065b4a07123638c220c0792e9250a458e6

 guns-vip-main/src/main/java/cn/stylefeng/guns/modular/om/productionOrderBatchInfo/controller/ProductionOrderBatchInfoController.java

@@ -171,17 +171,20 @@
        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())){
        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 = Integer.parseInt(productionOrderBatchInfoParam.getSpareField1())+Integer.parseInt(batchInfo.getSpareField1());
                byId.setSpareField1(count1.toString());
                Integer count1 = productionOrderBatchInfoParam.getQuantity()+batchInfo.getQuantity();
                Integer count2 = batchInfo.getResidueQuantity()+productionOrderBatchInfoParam.getResidueQuantity();
                byId.setQuantity(count1);
                byId.setResidueQuantity(count2);
            }
        }
        byId.setState("是");
        byId.setLoadingCode(productionOrderBatchInfoParam.getLoadingCode());
        byId.setStatus("是");
        byId.setBatch(productionOrderBatchInfoParam.getBatch());
        productionOrderBatchInfoService.saveOrUpdate(byId);
        return ResponseData.success("1");
    }
@@ -190,9 +193,10 @@
    @RequestMapping("/resetting")
    public ResponseData resetting(ProductionOrderBatchInfoParam productionOrderBatchInfoParam) {
        ProductionOrderBatchInfo byId = productionOrderBatchInfoService.getById(productionOrderBatchInfoParam.getId());
        byId.setState("否");
        byId.setSpareField1("0");
        byId.setLoadingCode("");
        byId.setStatus("否");
        byId.setQuantity(0);
        byId.setResidueQuantity(0);
        byId.setBatch("");
        productionOrderBatchInfoService.saveOrUpdate(byId);
        return ResponseData.success();
    }