Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

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

@@ -136,6 +136,7 @@ public class MaterialCirculationServiceImpl implements IMaterialCirculationServi
         MaterialCirculation materialCirculation1 = new MaterialCirculation();
         materialCirculation1.setId(materialCirculation.getId());
         materialCirculation1.setDocumentStatus("2");
+        materialCirculationMapper.updateMaterialCirculation(materialCirculation1);
         return AjaxResult.success("取货成功！");
 
     }

zkqy-custom-business/src/main/resources/mapper/MaterialCirculationMapper.xml

@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateMaterialCirculation" parameterType="com.zkqy.business.domain.MaterialCirculation">
-        update material_circulation
+        update {DBNAME}.material_circulation
         <trim prefix="SET" suffixOverrides=",">
             <if test="goodsname != null">goodsname = #{goodsname},</if>
             <if test="goodsnum != null">goodsnum = #{goodsnum},</if>

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

@@ -0,0 +1,63 @@
+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("e72def21-9b11-421b-965b-4b8781d73c74")
+@Scope("prototype")
+public class WrappingNode implements IRunBPMService {
+
+    @Autowired
+    private ICommonService commonService;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        return null;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        System.err.println(iRunBPMEntity.toString());
+        String id = iRunBPMEntity.getExecutionMap().get("taskPlanKey").toString();
+        CommonEntity commonEntity = new CommonEntity();
+        commonEntity.getBasicMap().put("tableName","sale_products");
+        commonEntity.getConditionMap().put("id",id);
+        commonEntity.getCommMap().put("status","6");
+        commonService.edit(commonEntity);
+
+        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-ui/src/views/orderMange/purchase/index.vue

@@ -523,20 +523,23 @@ export default {
         },
       };
       let res = await listTableData(payLoad);
+      console.log(res,"ddddddd");
       console.log(res.rows[0].resultMap.units,"打印数据")
       console.log(res.rows[0].resultMap.specificationModel,"打印数据")
-      let labelRes = await getDictLabel(purchaseMaterielId);
-      if (res.code == 200 && labelRes.code == 200) {
+      // let labelRes = await getDictLabel(purchaseMaterielId);
+      if (res.code == 200) {
         let data = res.rows[0]?.resultMap;
         printData.serialNumber = purchaseSerialNumber;
         printData.materielId = purchaseMaterielId;
         // printData.materielName = data?.materielName;//母粒名称
-        // printData.units = purchaseUnits;
-        // printData.specificationModel = purchaseSpecification;
-        printData.units = res.rows[0].resultMap.units;
-        printData.specificationModel = res.rows[0].resultMap.specificationModel;
+        printData.units = data.units;
+        printData.specificationModel = data.specificationModel;
         printData.quantity=purchaseQuantity
-        // printData.dictLabel = labelRes.msg;
+        printData.materielName=data?.materieEncoding;//默认是转码后的名称
+        if(data.materieEncoding==""||data.materieEncoding==undefined){
+          printData.materielName=data.materielName;
+        }
+        //printData.dictLabel = labelRes.msg;
       }
       this.$refs.printFormRef.validate((valid) => {
         if (valid) {
@@ -555,7 +558,7 @@ export default {
                 },
                 {
                   label: "名称",
-                  value: labelRes.msg,
+                  value: printData.materielName,
                 },
                 {
                   label: "序号",