加弹拣货、加弹上丝节点

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

@@ -209,7 +209,7 @@ public class ProductInventoryServiceImpl implements IProductInventoryService
             productOutboundRecordMapper.insertProductOutboundRecord(productOutboundRecord);
             //出库   减 箱数、筒数、净重、毛重,
             //得到当前库存
-            ProductInventory productInventory = productInventoryMapper.selectProductInventoryByQrCode(vo.getQrCode());
+            ProductInventory productInventory = productInventoryMapper.selectProductInventoryByQrCode(productCodeList.getQrCode());
             ProductInventory editProductInventory = new ProductInventory();
             editProductInventory.setId(productInventory.getId());
             //筒数

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AddAmmunitionPickingUp.java

@@ -0,0 +1,89 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.chemicalfiber;
+
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.ICommonService;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * 加弹-拣货-正常节点
+ */
+@Service("e91cb522-247d-44ef-840b-30524a7f0ddc")
+@Scope("prototype")
+public class AddAmmunitionPickingUp implements IRunBPMService {
+
+    @Autowired
+    private ICommonService commonService;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+
+        //销售单货品详情
+        CommonEntity saleProductsParam = new CommonEntity();
+        saleProductsParam.getBasicMap().put("tableName","sale_products");
+        saleProductsParam.getConditionMap().put("id",bpmRunNodeFromVo.getTaskPlanKey());
+        saleProductsParam.getConditionMap().put("del_flag","0");
+        CommonEntity saleProducts = commonService.getInfoById(saleProductsParam);
+
+        //根据货品编号查询货品信息
+        CommonEntity productParam = new CommonEntity();
+        productParam.getBasicMap().put("tableName","production");
+        productParam.getConditionMap().put("product_no",saleProducts.getResultMap().get("product_no"));
+        productParam.getConditionMap().put("del_flag","0");
+        CommonEntity products = commonService.getInfoById(productParam);
+
+
+        //根据销单货品编号查询拣货信息
+        CommonEntity productAddAmmunitionParam = new CommonEntity();
+        productAddAmmunitionParam.getBasicMap().put("tableName","sale_product_add_ammunition");
+        productAddAmmunitionParam.getConditionMap().put("sale_product_id",bpmRunNodeFromVo.getTaskPlanKey());
+        productAddAmmunitionParam.getConditionMap().put("del_flag","0");
+        productAddAmmunitionParam.getConditionMap().put("add_ammunition_type","1");
+        CommonEntity productAddAmmunition = commonService.getInfoById(productAddAmmunitionParam);
+
+        CommonEntity result = new CommonEntity();
+        result.getResultMap().put("saleProducts",saleProducts);
+        result.getResultMap().put("products",products);
+        result.getResultMap().put("productAddAmmunition",productAddAmmunition);
+
+
+
+
+        return result;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/AddAmmunitionWireOn.java

@@ -0,0 +1,82 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.chemicalfiber;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.ICommonService;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * 加弹-上丝-正常节点
+ */
+@Service("13279a88-be25-4af8-ac6a-508a006e29b8")
+@Scope("prototype")
+public class AddAmmunitionWireOn implements IRunBPMService {
+
+    @Autowired
+    private ICommonService commonService;
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+
+        //销售单货品详情
+        CommonEntity saleProductsParam = new CommonEntity();
+        saleProductsParam.getBasicMap().put("tableName","sale_products");
+        saleProductsParam.getConditionMap().put("id",bpmRunNodeFromVo.getTaskPlanKey());
+        saleProductsParam.getConditionMap().put("del_flag","0");
+        CommonEntity saleProducts = commonService.getInfoById(saleProductsParam);
+
+        //根据货品编号查询货品信息
+        CommonEntity productParam = new CommonEntity();
+        productParam.getBasicMap().put("tableName","production");
+        productParam.getConditionMap().put("product_no",saleProducts.getResultMap().get("product_no"));
+        productParam.getConditionMap().put("del_flag","0");
+        CommonEntity products = commonService.getInfoById(productParam);
+
+        //根据销单货品编号查询拣货信息
+        CommonEntity productAddAmmunitionParam = new CommonEntity();
+        productAddAmmunitionParam.getBasicMap().put("tableName","sale_product_add_ammunition");
+        productAddAmmunitionParam.getConditionMap().put("sale_product_id",bpmRunNodeFromVo.getTaskPlanKey());
+        productAddAmmunitionParam.getConditionMap().put("del_flag","0");
+        productAddAmmunitionParam.getConditionMap().put("add_ammunition_type","2");
+        CommonEntity productAddAmmunition = commonService.getInfoById(productAddAmmunitionParam);
+
+        CommonEntity result = new CommonEntity();
+        result.getResultMap().put("saleProducts",saleProducts);
+        result.getResultMap().put("products",products);
+        result.getResultMap().put("productAddAmmunition",productAddAmmunition);
+        return result;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}