feat：码单删除没有库存删除不掉问题

zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductCodeListController.java

@@ -66,7 +66,6 @@ public class ProductCodeListController extends BaseController {
         return getDataTable(list);
     }
 
-
     @GetMapping("/productCodeListQueryInBatches")
     @ApiOperation(value = "接续操作")
     public TableDataInfo productCodeListQueryInBatches(@RequestParam("productId") String  productId) {

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductInventoryServiceImpl.java

@@ -17,6 +17,7 @@ import com.zkqy.business.service.ISaleAccountsReceivableDetailService;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.utils.DateUtils;
 import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.common.utils.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -576,37 +577,40 @@ public class ProductInventoryServiceImpl implements IProductInventoryService {
         //出库   减 箱数、筒数、净重、毛重,
         //得到当前库存
         ProductInventory productInventory = productInventoryMapper.selectProductInventoryByQrCode(productCodeListVO.getQrCode());
-        ProductInventory editProductInventory = new ProductInventory();
-        editProductInventory.setId(productInventory.getId());
-        //筒数
-        if (productInventory.getTotalCanisterNum() - productCodeListVO.getCanisterNum() < 0) {
-            return AjaxResult.error("当前库存筒数不足");
-        } else {
-            editProductInventory.setTotalCanisterNum(productInventory.getTotalCanisterNum() - productCodeListVO.getCanisterNum());
-        }
-        //箱数
-        if (productInventory.getTotalBoxNum() - 1 < 0) {
-            return AjaxResult.error("当前库存箱数不足");
-        } else {
-            editProductInventory.setTotalBoxNum(productInventory.getTotalBoxNum() - 1);
-        }
-        //净重
-        if (productInventory.getTotalSuttle() - productCodeListVO.getSuttle() < 0) {
-            return AjaxResult.error("当前库存净重不足");
-        } else {
-            editProductInventory.setTotalSuttle(handlingWeight(productInventory.getTotalSuttle() - productCodeListVO.getSuttle()));
-        }
-        //毛重
-        if (productInventory.getTotalGrossWeight() - productCodeListVO.getGrossWeight() < 0) {
-            return AjaxResult.error("当前库存毛重不足");
-        } else {
-            editProductInventory.setTotalGrossWeight(handlingWeight(productInventory.getTotalGrossWeight() - productCodeListVO.getGrossWeight()));
-        }
-        // 删除入库记录
+        if(!StringUtils.isNull(productInventory)){
+            ProductInventory editProductInventory = new ProductInventory();
+            editProductInventory.setId(productInventory.getId());
+            //筒数
+            if (productInventory.getTotalCanisterNum() - productCodeListVO.getCanisterNum() < 0) {
+                return AjaxResult.error("当前库存筒数不足");
+            } else {
+                editProductInventory.setTotalCanisterNum(productInventory.getTotalCanisterNum() - productCodeListVO.getCanisterNum());
+            }
+            //箱数
+            if (productInventory.getTotalBoxNum() - 1 < 0) {
+                return AjaxResult.error("当前库存箱数不足");
+            } else {
+                editProductInventory.setTotalBoxNum(productInventory.getTotalBoxNum() - 1);
+            }
+            //净重
+            if (productInventory.getTotalSuttle() - productCodeListVO.getSuttle() < 0) {
+                return AjaxResult.error("当前库存净重不足");
+            } else {
+                editProductInventory.setTotalSuttle(handlingWeight(productInventory.getTotalSuttle() - productCodeListVO.getSuttle()));
+            }
+            //毛重
+            if (productInventory.getTotalGrossWeight() - productCodeListVO.getGrossWeight() < 0) {
+                return AjaxResult.error("当前库存毛重不足");
+            } else {
+                editProductInventory.setTotalGrossWeight(handlingWeight(productInventory.getTotalGrossWeight() - productCodeListVO.getGrossWeight()));
+            }
+            // 删除入库记录
 //        productOutboundRecordMapper.deleteProductOutboundRecordByUUID(productCodeListVO.getQrCodeId());
-        productWarehousingRecordMapper.deleteProductWarehousingRecordByUUID(productCodeListVO.getQrCodeId());
-
-        return AjaxResult.success(productInventoryMapper.updateProductInventory(editProductInventory));
+            return AjaxResult.success(productInventoryMapper.updateProductInventory(editProductInventory));
+        }else {
+            productWarehousingRecordMapper.deleteProductWarehousingRecordByUUID(productCodeListVO.getQrCodeId());
+              return AjaxResult.success("删除成功");
+        }
     }
 
     @Override

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/jiaoyu/AssembleImpl.java

@@ -44,30 +44,31 @@ public class AssembleImpl implements IRunBPMService {
 
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
-        //不是空的就抛出异常差数据的方法
-        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
-            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        }
-        //不是回滚节点执行
-        Map<String, Object> map = new HashMap<>();
-        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
-        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        //获取数据采集设备上料数量
-        HashMap requestString=new HashMap();
-        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
-        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
-        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
-        String string2 = respMap1.get("result").toString();
-        Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
-        String assembled = respMap2.get("assembled").toString();
-        HashMap hashMap=new HashMap();
-        hashMap.put("assembled",assembled);//已组装数量
-        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
-        echoNodeFormData1.getResultMap().remove("taskProcessKey");
-        echoNodeFormData1.getResultMap().remove("taskNodeKey");
-        echoNodeFormData1.getResultMap().putAll(hashMap);
-        return  echoNodeFormData1;
+//        //不是空的就抛出异常差数据的方法
+//        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
+//            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        }
+//        //不是回滚节点执行
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
+//        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
+//        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        //获取数据采集设备上料数量
+//        HashMap requestString=new HashMap();
+//        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
+//        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
+//        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
+//        String string2 = respMap1.get("result").toString();
+//        Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
+//        String assembled = respMap2.get("assembled").toString();
+//        HashMap hashMap=new HashMap();
+//        hashMap.put("assembled",assembled);//已组装数量
+//        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
+//        echoNodeFormData1.getResultMap().remove("taskProcessKey");
+//        echoNodeFormData1.getResultMap().remove("taskNodeKey");
+//        echoNodeFormData1.getResultMap().putAll(hashMap);
+//        return  echoNodeFormData1;
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
     }
 
     /**

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/jiaoyu/DetectionImpl.java

@@ -41,33 +41,34 @@ public class DetectionImpl implements IRunBPMService {
 
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
-        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
-            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        }
-        //不是回滚节点执行
-        Map<String, Object> map = new HashMap<>();
-        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
-        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        //获取数据采集设备上料数量
-        HashMap requestString=new HashMap();
-        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
-        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
-        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
-        Map respMap2 = JSONObject.parseObject(respMap1.get("result").toString(), HashMap.class);
-        String assembled = respMap2.get("assembled").toString();
-        String qualified = respMap2.get("qualified").toString();
-        String unqualified = respMap2.get("unqualified").toString();
-        //必须得移除这个要不然第一此保存操作的时候就是修改操作了
-        HashMap hashMap=new HashMap();
-        hashMap.put("assembled",assembled);//已组装数量
-        hashMap.put("qualified",qualified);//质检合格数量
-        hashMap.put("unqualified",unqualified);//质检不合格数量
-        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
-        echoNodeFormData1.getResultMap().remove("taskProcessKey");
-        echoNodeFormData1.getResultMap().remove("taskNodeKey");
-        echoNodeFormData1.getResultMap().putAll(hashMap);
-        return  echoNodeFormData1;
+//        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
+//            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        }
+//        //不是回滚节点执行
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
+//        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
+//        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        //获取数据采集设备上料数量
+//        HashMap requestString=new HashMap();
+//        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
+//        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
+//        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
+//        Map respMap2 = JSONObject.parseObject(respMap1.get("result").toString(), HashMap.class);
+//        String assembled = respMap2.get("assembled").toString();
+//        String qualified = respMap2.get("qualified").toString();
+//        String unqualified = respMap2.get("unqualified").toString();
+//        //必须得移除这个要不然第一此保存操作的时候就是修改操作了
+//        HashMap hashMap=new HashMap();
+//        hashMap.put("assembled",assembled);//已组装数量
+//        hashMap.put("qualified",qualified);//质检合格数量
+//        hashMap.put("unqualified",unqualified);//质检不合格数量
+//        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
+//        echoNodeFormData1.getResultMap().remove("taskProcessKey");
+//        echoNodeFormData1.getResultMap().remove("taskNodeKey");
+//        echoNodeFormData1.getResultMap().putAll(hashMap);
+//        return  echoNodeFormData1;
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
     }
 
     /**

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/jiaoyu/LoadingImpl.java

@@ -49,32 +49,32 @@ public class LoadingImpl implements IRunBPMService {
 
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
-        //不是空的就执行查询抛出异常的数据的方法
-        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
-            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        }
-        //第一次执行节点获取回显数据的操作
-        Map<String, Object> map = new HashMap<>();
-        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
-        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        //获取数据采集设备上料数量
-        HashMap requestString=new HashMap();
-        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
-        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
-        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
-        String string2 = respMap1.get("result").toString();
-        Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
-        String materials = respMap2.get("materials").toString();
-        //必须得移除这个要不然第一此保存操作的时候就是修改操作了
-        HashMap hashMap=new HashMap();
-        hashMap.put("materials",materials);//已上料数量
-        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
-        echoNodeFormData1.getResultMap().remove("taskProcessKey");
-        echoNodeFormData1.getResultMap().remove("taskNodeKey");
-        echoNodeFormData1.getResultMap().putAll(hashMap);
-
-        return  echoNodeFormData1;
+//        //不是空的就执行查询抛出异常的数据的方法
+//        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
+//            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        }
+//        //第一次执行节点获取回显数据的操作
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
+//        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
+//        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        //获取数据采集设备上料数量
+//        HashMap requestString=new HashMap();
+//        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
+//        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
+//        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
+//        String string2 = respMap1.get("result").toString();
+//        Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
+//        String materials = respMap2.get("materials").toString();
+//        //必须得移除这个要不然第一此保存操作的时候就是修改操作了
+//        HashMap hashMap=new HashMap();
+//        hashMap.put("materials",materials);//已上料数量
+//        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
+//        echoNodeFormData1.getResultMap().remove("taskProcessKey");
+//        echoNodeFormData1.getResultMap().remove("taskNodeKey");
+//        echoNodeFormData1.getResultMap().putAll(hashMap);
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        return  echoNodeFormData1;
     }
 /**
  * //

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/jiaoyu/ProcessingImpl.java

@@ -44,30 +44,31 @@ public class ProcessingImpl implements IRunBPMService {
 
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
-        //不是空的就执行查询抛出异常的数据的方法
-        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
-            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        }
-        //第一次执行节点获取回显数据的操作
-        Map<String, Object> map = new HashMap<>();
-        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
-        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        //获取数据采集设备上料数量
-        HashMap requestString=new HashMap();
-        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
-        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
-        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
-        String string2 = respMap1.get("result").toString();
-        Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
-        String processed = respMap2.get("processed").toString();
-        HashMap hashMap=new HashMap();
-        hashMap.put("processed",processed);//已加工数量
-        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
-        echoNodeFormData1.getResultMap().remove("taskProcessKey");
-        echoNodeFormData1.getResultMap().remove("taskNodeKey");
-        echoNodeFormData1.getResultMap().putAll(hashMap);
-        return  echoNodeFormData1;
+//        //不是空的就执行查询抛出异常的数据的方法
+//        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
+//            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        }
+//        //第一次执行节点获取回显数据的操作
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
+//        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
+//        CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        //获取数据采集设备上料数量
+//        HashMap requestString=new HashMap();
+//        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
+//        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
+//        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
+//        String string2 = respMap1.get("result").toString();
+//        Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
+//        String processed = respMap2.get("processed").toString();
+//        HashMap hashMap=new HashMap();
+//        hashMap.put("processed",processed);//已加工数量
+//        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
+//        echoNodeFormData1.getResultMap().remove("taskProcessKey");
+//        echoNodeFormData1.getResultMap().remove("taskNodeKey");
+//        echoNodeFormData1.getResultMap().putAll(hashMap);
+//        return  echoNodeFormData1;
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
     }
 
     /**

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/jiaoyu/WareHousingImpl.java

@@ -43,42 +43,52 @@ public class WareHousingImpl implements IRunBPMService {
 
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
-        //回滚异常节点表单数据查询
-        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
-            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        }
-        //不是回滚节点执行
+//        //回滚异常节点表单数据查询
+//        if(!bpmRunNodeFromVo.getFormDataVoList().isEmpty()){
+//            return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+//        }
+//        //不是回滚节点执行
         Map<String, Object> map = new HashMap<>();
         map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
         bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("schedule_table", map, false,false));
         CommonEntity echoNodeFormData1 = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
-        //获取数据采集设备上料数量
-        HashMap requestString=new HashMap();
-        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
-        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
-        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
-        Map respMap2 = JSONObject.parseObject(respMap1.get("result").toString(), HashMap.class);
-        String materials = respMap2.get("materials").toString();
-        String processed = respMap2.get("processed").toString();
-        String assembled = respMap2.get("assembled").toString();
-        String qualified = respMap2.get("qualified").toString();
-        String unqualified = respMap2.get("unqualified").toString();
-        String inStock = respMap2.get("inStock").toString();
-        //必须得移除这个要不然第一此保存操作的时候就是修改操作了
+//        //获取数据采集设备上料数量
+//        HashMap requestString=new HashMap();
+//        requestString.put("id",echoNodeFormData1.getResultMap().get("taskId"));
+//        String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
+//        Map respMap1 = JSONObject.parseObject(string1, HashMap.class);
+//        Map respMap2 = JSONObject.parseObject(respMap1.get("result").toString(), HashMap.class);
+//        String materials = respMap2.get("materials").toString();
+//        String processed = respMap2.get("processed").toString();
+//        String assembled = respMap2.get("assembled").toString();
+//        String qualified = respMap2.get("qualified").toString();
+//        String unqualified = respMap2.get("unqualified").toString();
+//        String inStock = respMap2.get("inStock").toString();
+//        //必须得移除这个要不然第一此保存操作的时候就是修改操作了
+//        HashMap hashMap=new HashMap();
+//        hashMap.put("inStock",inStock);//已入库数量
+//        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
+//        hashMap.put("psk",bpmRunNodeFromVo.getTaskProcessKey());//流程key
+//        hashMap.put("psName",echoNodeFormData1.getResultMap().get("taskName"));
+//        hashMap.put("materials",materials);
+//        hashMap.put("processed",processed);
+//        hashMap.put("assembled",assembled);
+//        hashMap.put("qualified",qualified);
+//        hashMap.put("unqualified",unqualified);
+//        echoNodeFormData1.getResultMap().remove("taskProcessKey");
+//        echoNodeFormData1.getResultMap().remove("taskNodeKey");
+//        echoNodeFormData1.getResultMap().putAll(hashMap);
+//        return  echoNodeFormData1;
+        //绑定主制班组下拉框
+        Map<String, Object> map2 = new HashMap<>();
+        map2.put("del_flag", 0);
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("production", map2, false, "productionList"));
+
+        CommonEntity aa = echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
         HashMap hashMap=new HashMap();
-        hashMap.put("inStock",inStock);//已入库数量
-        hashMap.put("taskNumber",echoNodeFormData1.getResultMap().get("taskId"));//任务id--计划号
-        hashMap.put("psk",bpmRunNodeFromVo.getTaskProcessKey());//流程key
-        hashMap.put("psName",echoNodeFormData1.getResultMap().get("taskName"));
-        hashMap.put("materials",materials);
-        hashMap.put("processed",processed);
-        hashMap.put("assembled",assembled);
-        hashMap.put("qualified",qualified);
-        hashMap.put("unqualified",unqualified);
-        echoNodeFormData1.getResultMap().remove("taskProcessKey");
-        echoNodeFormData1.getResultMap().remove("taskNodeKey");
-        echoNodeFormData1.getResultMap().putAll(hashMap);
-        return  echoNodeFormData1;
+        hashMap.put("productName",echoNodeFormData1.getResultMap().get("productId"));//已组装数量
+        aa.getResultMap().putAll(hashMap);
+        return aa;
     }
 
     /**
@@ -102,7 +112,51 @@ public class WareHousingImpl implements IRunBPMService {
     public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
         //害怕有异常节点回滚操作
 //        String taskIdString = iRunBPMEntity.getExecutionMap().get("taskId").toString();
-////        if(!redisCache.hasKey("524b8b00-1153-41b4-b098-a0c60e66a1a6"+taskIdString)){
+//        //根据任务id获取产品信息
+        String productId = iRunBPMEntity.getExecutionMap().get("productId").toString();
+        //入库数量
+        String inStock = iRunBPMEntity.getExecutionMap().get("inStock").toString();
+        //查询这个产线属于哪个车间的---停止产线
+        CommonEntity commonEntity3 = new CommonEntity();
+        //查询这个产线属于哪个车间的
+        commonEntity3.getBasicMap().put("tableName","inventory");
+        commonEntity3.getQueryMap().put("stock_number",productId);
+        List<CommonEntity> commonEntities3 = commonService.selectList(commonEntity3);
+        //入库已经存在了 ->修改
+        if(commonEntities3.size()>0){
+            CommonEntity common = commonEntities3.get(0);
+            String inventoryQuantity = common.getResultMap().get("inventoryQuantity").toString();
+            int i = Integer.parseInt(inStock)+Integer.parseInt(inventoryQuantity);
+            CommonEntity commonEntity5 = new CommonEntity();
+            commonEntity5.getBasicMap().put("tableName","inventory");
+            commonEntity5.getConditionMap().put("stock_number",productId);
+            commonEntity5.getCommMap().put("inventoryQuantity",i);
+            commonService.edit(commonEntity5);
+        //新增
+        }else {
+            commonEntity3.getBasicMap().put("tableName","production");
+            commonEntity3.getQueryMap().put("id",productId);
+            List<CommonEntity> cp = commonService.selectList(commonEntity3);
+            CommonEntity common1 = cp.get(0);
+
+            String productNo = common1.getResultMap().get("productNo").toString();
+            String productName = common1.getResultMap().get("productName").toString();
+
+            HashMap hashMap=new HashMap();
+            hashMap.put("stockNumber",productId);
+            hashMap.put("productName",productName);
+            hashMap.put("inventoryQuantity",inStock);
+            List<Map<String,String>> commonEntities=new ArrayList<>();
+            commonEntities.add(hashMap);
+
+            //批量插入
+            CommonEntity common=new CommonEntity();
+            common.setAddListMap(commonEntities);
+            common.getBasicMap().put("tableName","inventory");
+            commonService.batchInsert(common);
+        }
+        System.out.println("111111"+iRunBPMEntity);
+ ////        if(!redisCache.hasKey("524b8b00-1153-41b4-b098-a0c60e66a1a6"+taskIdString)){
               //获取数据采集设备上料数量
 //            HashMap requestString=new HashMap();
 //            requestString.put("id",taskIdString);