From f61e1f51a081849af8dd5a18dcdae68ec1e65758 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Wed, 7 Jun 2023 16:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/zyplanprocess/ZyPlanProcessList.vue | 48 ++++++++++++++++++-
 .../controller/ZyPlanProcessController.java   |  9 ++++
 .../productplan/entity/ZyPlanProcess.java     |  9 ++++
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zyplanprocess/ZyPlanProcessList.vue b/ant-design-vue-jeecg/src/views/zyplanprocess/ZyPlanProcessList.vue
index 6a1b745f..0b17493c 100644
--- a/ant-design-vue-jeecg/src/views/zyplanprocess/ZyPlanProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/zyplanprocess/ZyPlanProcessList.vue
@@ -55,6 +55,12 @@
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
+        <template slot="gw" slot-scope="text, record">
+          <a @click="gw(record.stationId)">{{text}}</a>
+        </template>
+        <template slot="gd" slot-scope="text, record">
+          <a @click="gd(record.productNo)">{{text}}</a>
+        </template>
         <template slot="nodata" slot-scope="text, record">
           <span v-if="!text" style="font-size: 14px;font-style: italic;">无</span>
           <span v-else style="font-size: 14px;font-style: italic;">{{record.proProcessName}}</span>
@@ -103,6 +109,8 @@
     </div>
 
     <zy-plan-process-modal ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal>
+    <station-modal1 ref="modalFormgw"></station-modal1>
+    <work-order-modal ref="modalFormgd"></work-order-modal>
   </a-card>
 </template>
 
@@ -113,12 +121,17 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyPlanProcessModal from './modules/ZyPlanProcessModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import StationModal1 from "../team/modules/StationModal1";
+  import WorkOrderModal from "../workorder/modules/WorkOrderModal";
+  import {deleteAction, getAction} from "@api/manage";
 
   export default {
     name: 'ZyPlanProcessList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyPlanProcessModal
+      ZyPlanProcessModal,
+      StationModal1,
+      WorkOrderModal
     },
     data () {
       return {
@@ -135,6 +148,17 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'工单编号',
+            align:"center",
+            dataIndex: 'productNo',
+            scopedSlots: {customRender: 'gd'}
+          },
+          {
+            title:'产品名称',
+            align:"center",
+            dataIndex: 'productCode_dictText'
+          },
           {
             title:'工序名称',
             align:"center",
@@ -143,7 +167,8 @@
           {
             title:'工位名称',
             align:"center",
-            dataIndex: 'stationName'
+            dataIndex: 'stationName',
+            scopedSlots: {customRender: 'gw'}
           },
           {
             title:'工位序号',
@@ -223,6 +248,25 @@
       },
     },
     methods: {
+      gw(stationId){
+        getAction("/team/station/queryById", {id: stationId}).then((res) => {
+          if (res.success) {
+            this.$refs.modalFormgw.edit(res.result);
+            this.$refs.modalFormgw.title="详情";
+          } else {
+          }
+        })
+      },
+      gd(orderCode){
+        getAction("/workOrder/workOrder/queryByOrderCode", {orderCode: orderCode}).then((res) => {
+          if (res.success) {
+            this.$refs.modalFormgd.edit(res.result);
+            this.$refs.modalFormgd.title="详情";
+            this.$refs.modalFormgd.disableSubmit = true;
+          } else {
+          }
+        })
+      },
       initDictConfig(){
       },
     }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
index d5008bfa..bed70015 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java
@@ -19,8 +19,10 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.productplan.entity.ZyPlanProcess;
+import org.jeecg.modules.productplan.entity.ZyProductPlan;
 import org.jeecg.modules.productplan.entity.vo.ProcessDataVo;
 import org.jeecg.modules.productplan.service.IZyPlanProcessService;
+import org.jeecg.modules.productplan.service.IZyProductPlanService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecg.modules.team.entity.Station;
@@ -59,6 +61,8 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
     private IStationMachineService iStationMachineService;
     @Autowired
     private IStationToolService iStationToolService;
+    @Autowired
+    private IZyProductPlanService zyProductPlanService;
 
     private static Map<String,String> useridstationid = new HashMap<String,String>(){{
         put("GW01","1600683844590194690");
@@ -379,6 +383,11 @@ public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyP
         queryWrapper.eq("station_id",stationid);
         Page<ZyPlanProcess> page = new Page<ZyPlanProcess>(pageNo, pageSize);
         IPage<ZyPlanProcess> pageList = zyPlanProcessService.page(page, queryWrapper);
+        for(int i = 0 ; i < pageList.getRecords().size() ; i++){
+            ZyProductPlan zyProductPlan = zyProductPlanService.getById(pageList.getRecords().get(i).getPlanId());
+            pageList.getRecords().get(i).setProductCode(zyProductPlan.getProductNo());
+            pageList.getRecords().get(i).setProductNo(zyProductPlan.getProductCode());
+        }
         return Result.OK(pageList);
     }
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
index 73e5e3f6..1e695d68 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/entity/ZyPlanProcess.java
@@ -96,6 +96,15 @@ public class ZyPlanProcess implements Serializable {
 
     @TableField(exist = false)
     private List<GroupxMemeberVo> userIdList;
+
+    @TableField(exist = false)
+    private String productNo;
+
+    @TableField(exist = false)
+    @Dict(dictTable = "zy_product", dicText = "product_name", dicCode = "product_code")
+    private String productCode;
+
+
     /**
      * 设备id列表
      */