feat:教育节点页面开发

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/CommonServiceImpl.java

@@ -51,14 +51,11 @@ public class CommonServiceImpl implements ICommonService {
     @Override
     public int batchInsert(CommonEntity commonEntity) {
         String tableName = (String) commonEntity.getBasicMap().get("tableName");
-
-
         List<Map<String, String>> list = commonEntity.getAddListMap();
         List<LinkedHashMap<String, String>> listAsd = new ArrayList<>();
         list.forEach(item -> {  // 批量导入数据给导入数据增加默认值
             Map<String, String> asd = new LinkedHashMap<>();
             asd.putAll(item);
-
             asd.put("create_time", DateUtils.getTime());
             asd.put("create_by", SecurityUtils.getUsername());
             asd.put("create_by_id", SecurityUtils.getUserId().toString());

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

@@ -3,19 +3,24 @@ package com.zkqy.execution.produce.dispersed.service.impl.runbpm.jiaoyu;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.redis.RedisCache;
 import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
 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.IRunBPMService;
+import com.zkqy.execution.produce.dispersed.service.impl.CommonServiceImpl;
 import com.zkqy.execution.produce.utils.EchoNodeFormData;
 import com.zkqy.execution.produce.utils.Sending;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PreDestroy;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,9 +37,16 @@ public class LoadingImpl implements IRunBPMService {
     @Autowired
     private EchoNodeFormData echoNodeFormData;
 
+    @Autowired
+    private CommonServiceImpl commonService;
+
+
     @Autowired
     private Sending sending;
 
+    @Autowired
+    private RedisCache  redisCache;
+
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         //不是空的就执行查询抛出异常的数据的方法
@@ -61,6 +73,7 @@ public class LoadingImpl implements IRunBPMService {
         echoNodeFormData1.getResultMap().remove("taskProcessKey");
         echoNodeFormData1.getResultMap().remove("taskNodeKey");
         echoNodeFormData1.getResultMap().putAll(hashMap);
+
         return  echoNodeFormData1;
     }
 /**
@@ -97,7 +110,34 @@ public class LoadingImpl implements IRunBPMService {
      */
     @Override
     public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
-        CommonEntity commonEntity = new CommonEntity();
+        String taskIdString = iRunBPMEntity.getExecutionMap().get("taskId").toString();
+        if(!redisCache.hasKey("17af9e43-4bbe-4661-babc-ee09f67972b6"+taskIdString)){
+            //获取数据采集设备上料数量
+            HashMap requestString=new HashMap();
+            requestString.put("id",taskIdString);
+            String string1 = sending.sendGetRequestWithParams("http://mes.063520.com/api/v1/mes/public/task/info", requestString, String.class).toString();
+            String string2 = JSONObject.parseObject(string1, HashMap.class).get("result").toString();
+            Map respMap2 = JSONObject.parseObject(string2, HashMap.class);
+            //上料节点---有数据了证明已经把所有的数据采集设备数据都给拿回来了
+            //task_id、materials、processed、assembled、qualified、unqualified、in_stock
+            CommonEntity commonEntity=new CommonEntity();
+            HashMap basicMap=new HashMap();
+            basicMap.put("tableName","data_acquisition_information");
+            commonEntity.setBasicMap(basicMap);
+            //构造要添加的数据
+            respMap2.put("task_id",respMap2.get("taskId"));
+            respMap2.remove("taskId");
+            respMap2.remove("id");
+            respMap2.put("in_stock",respMap2.get("inStock"));
+            respMap2.remove("inStock");
+            respMap2.remove("createTime");
+            respMap2.remove("updateTime");
+            List<Map<String,String>> mapList=new ArrayList<>();
+            mapList.add(respMap2);
+            commonEntity.setAddListMap(mapList);
+            commonService.batchInsert(commonEntity);
+            redisCache.setCacheObject("17af9e43-4bbe-4661-babc-ee09f67972b6"+taskIdString,"1");
+        }
         return AjaxResult.success();
     }
 

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

@@ -53,6 +53,8 @@ public class WareHousingImpl implements IRunBPMService {
         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"));
         echoNodeFormData1.getResultMap().remove("taskProcessKey");
         echoNodeFormData1.getResultMap().remove("taskNodeKey");
         echoNodeFormData1.getResultMap().putAll(hashMap);

zkqy-ui/src/views/bussiness/dialogCompments/Edu/Detection.vue

@@ -12,10 +12,10 @@
               <el-input v-model="form.assembled" readonly disabled></el-input>
             </el-form-item>
             <el-form-item label="合格数量:">
-              <el-input v-model="form.qualified"></el-input>
+              <el-input v-model="form.qualified"  readonly disabled></el-input>
             </el-form-item>
             <el-form-item label="不合格数量:">
-              <el-input v-model="form.unqualified"></el-input>
+              <el-input v-model="form.unqualified"  readonly disabled></el-input>
             </el-form-item>
               <!--记录信息-->
               <el-form-item>

zkqy-ui/src/views/bussiness/dialogCompments/Edu/Processing.vue

@@ -8,7 +8,7 @@
             <el-form-item label="投产数量:">
               <el-input v-model="form.productQuantity" readonly disabled></el-input>
             </el-form-item>
-            <el-form-item label="加工完成数量" :label-width="'90px' ">
+            <el-form-item label="加工数量:">
               <el-input v-model="form.processed"  readonly disabled></el-input>
             </el-form-item>
             <!--记录信息-->
@@ -18,7 +18,7 @@
                 class="btn"
                 @click="submitHandler"
                 style="margin-left:-500px"
-              >记录信息</el-button
+                >记录信息</el-button
               >
             </el-form-item>
         </el-form>

zkqy-ui/src/views/bussiness/dialogCompments/Edu/WareHousing.vue

@@ -9,7 +9,7 @@
             <el-input v-model="form.productQuantity" readonly disabled></el-input>
           </el-form-item>
             <el-form-item label="入库数量:">
-              <el-input v-model="form.qualifiedQuantity" readonly disabled></el-input>
+              <el-input v-model="form.inStock" readonly disabled></el-input>
             </el-form-item>
           <!--记录信息-->
           <el-form-item>
@@ -36,7 +36,9 @@ export default {
             form: {
                 taskNumber: '',
                 productQuantity: '',
-                qualifiedQuantity: '',
+                psk:'',
+                psName:'',
+                inStock: '',
             }
         };
     },
@@ -69,44 +71,46 @@ export default {
             let res = await this.$refs.form?.validate();
             if (res) {
                 let payLoad = {};
-
                 if (this.isEdit) {
-                let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
-                payLoad.updateCommonEntityList = [
-                    {
-                    basicMap: {
-                        tableName: "finished",
-                    },
-                    conditionMap: {
-                        task_process_key: taskProcessKey,
-                        task_node_key: taskNodeKey,
-                    },
-                    commMap: {
-                      finished_weight: this.form.qualifiedQuantity,
-                    },
-                    },
-                ];
+                    let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+                    payLoad.updateCommonEntityList = [
+                        {
+                        basicMap: {
+                            tableName: "inventory",
+                        },
+                        conditionMap: {
+                            task_process_key: taskProcessKey,
+                            task_node_key: taskNodeKey,
+                        },
+                        commMap: {
+                          inventory_quantity: this.form.qualifiedQuantity,
+                        },
+                        },
+                    ];
                 } else {
                   console.log("新增")
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "finished",
+                        tableName: "inventory",
                     },
                     addListMap: [
                         {
-                          finished_weight: this.form.qualifiedQuantity,
+                          stock_number:this.form.psk,
+                          product_name:this.form.psName,
+                          inventory_quantity: this.form.inStock,
                         },
                     ],
                     },
                 ];
                 }
                 submitNodeForm(payLoad).then((response) => {
-                if (response.code == 200) {
-                    this.$modal.msgSuccess("保存成功");
-                } else {
-                    this.$modal.error("保存失败,请稍后再试");
-                }
+                  console.log(response);
+                    if (response.code == 200) {
+                        this.$modal.msgSuccess("保存成功");
+                    } else {
+                        this.$modal.error("保存失败,请稍后再试");
+                    }
                 });
             }
         },

zkqy-ui/src/views/login.vue

@@ -188,7 +188,6 @@ export default {
         windowTitle,
         windowLogo,
       } = this.config;
-
       // 设置背景图
       if (loginPageBackgroundImage) {
         let loginBgDom = document.getElementsByClassName("login");