From ca93852c5a6feca643e46b588906f30b03c6b03c Mon Sep 17 00:00:00 2001
From: "DESKTOP-H2PAFLR\\Administrator" <xuqianhao@88.com>
Date: Thu, 12 Oct 2023 11:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=AE=9A=E4=B9=89=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/md/MdProductDefineController.cs       |  11 +++++++
 .../0c1af12b-35be-44fe-8dd6-8c425ce93552.xls  | Bin 79360 -> 0 bytes
 .../b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx | Bin 4407 -> 0 bytes
 .../md/IService/IMdProductDefineService.cs    |   1 +
 ZR.Service/mes/md/MdProductDefineService.cs   |  14 ++++++--
 .../api/basisManagement/productEfinition.js   |   8 +++++
 .../OperationManagement/assemblyWorkshop.vue  |   4 +--
 .../views/basisManagement/devicestation.vue   |   4 +--
 .../basisManagement/productEfinition.vue      |  30 +++++++++++++-----
 .../workUnitComponent/workLine.vue            |   4 +--
 .../workUnitComponent/workstation.vue         |  18 +++++++----
 11 files changed, 70 insertions(+), 24 deletions(-)
 delete mode 100644 ZR.Admin.WebApi/Images/0c1af12b-35be-44fe-8dd6-8c425ce93552.xls
 delete mode 100644 ZR.Admin.WebApi/Images/b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx

diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
index 9295f724..89835487 100644
--- a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
@@ -59,6 +59,17 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
             List<MdUnit> units = mdProduct.GetProductDefineList();
             return SUCCESS(units);
         }
+        /// <summary>
+        /// 获取全部 产线
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getProcessroute")]
+        public IActionResult GetProcessroutelist()
+        {
+            List<MdWorkline> worklines = mdProduct.GetWorklineList();
+            return SUCCESS(worklines);
+        }
+
 
         /// <summary>
         /// add 产品
diff --git a/ZR.Admin.WebApi/Images/0c1af12b-35be-44fe-8dd6-8c425ce93552.xls b/ZR.Admin.WebApi/Images/0c1af12b-35be-44fe-8dd6-8c425ce93552.xls
deleted file mode 100644
index 6d2ca343a9f8a7aeb06dae159fd059b85bab4b19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79360
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

diff --git a/ZR.Admin.WebApi/Images/b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx b/ZR.Admin.WebApi/Images/b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx
deleted file mode 100644
index 71df49757375343ee7c63eb1739772e276bf062d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4407
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

diff --git a/ZR.Service/mes/md/IService/IMdProductDefineService.cs b/ZR.Service/mes/md/IService/IMdProductDefineService.cs
index 9f57b1c4..8540f0ad 100644
--- a/ZR.Service/mes/md/IService/IMdProductDefineService.cs
+++ b/ZR.Service/mes/md/IService/IMdProductDefineService.cs
@@ -16,6 +16,7 @@ namespace ZR.Service.mes.md.IService
         public MdProductDefine GetProductDefinebyPK(int measure);
         List<MdUnit> GetProductDefineList(string name);
         List<MdUnit> GetProductDefineList();
+        List<MdWorkline> GetWorklineList();
         public int InsertProductDefine(MdProductDefine jo);
         public int UpdateProductDefine(MdProductDefine paramss);
     }
diff --git a/ZR.Service/mes/md/MdProductDefineService.cs b/ZR.Service/mes/md/MdProductDefineService.cs
index c97cdc12..e47a70c6 100644
--- a/ZR.Service/mes/md/MdProductDefineService.cs
+++ b/ZR.Service/mes/md/MdProductDefineService.cs
@@ -65,8 +65,12 @@ namespace ZR.Service.mes.md
         public MdProductDefine GetProductDefinebyPK(int measure)
         {
             MdProductDefine  product=GetId(measure);
-            MdUnit unit = Context.Queryable<MdUnit>().Where(it=>it.MeasureId == product.ProductUnit).First();   
-            product.ProductUnitName= unit.MeasureName;
+            MdUnit unit = Context.Queryable<MdUnit>().Where(it=>it.MeasureId == product.ProductUnit).First();
+            if (unit != null)
+            {
+                product.ProductUnitName = unit.MeasureName;
+            }
+           
             return product;
         }
 
@@ -80,7 +84,11 @@ namespace ZR.Service.mes.md
             return Context.Queryable<MdUnit>().ToList();
         }
 
-   
+        public List<MdWorkline> GetWorklineList()
+        {
+            return Context.Queryable<MdWorkline>().ToList();
+        }
+
         public int InsertProductDefine(MdProductDefine jo)
         {
             return Insert(jo);
diff --git a/ZR.Vue/src/api/basisManagement/productEfinition.js b/ZR.Vue/src/api/basisManagement/productEfinition.js
index a08a915c..e8b57089 100644
--- a/ZR.Vue/src/api/basisManagement/productEfinition.js
+++ b/ZR.Vue/src/api/basisManagement/productEfinition.js
@@ -17,6 +17,14 @@ export function getUnitmeasure(query) {
   })
 }
 
+
+export function getProcessroute(query) {
+  return request({
+    url: '/mes/md/product/getProcessroute/' + query,
+    method: 'get',
+  })
+}
+
 export function updateUnitmeasure(data) {
   return request({
     url: '/mes/md/unit/updateUnit',
diff --git a/ZR.Vue/src/views/OperationManagement/assemblyWorkshop.vue b/ZR.Vue/src/views/OperationManagement/assemblyWorkshop.vue
index b946a56a..905cc87d 100644
--- a/ZR.Vue/src/views/OperationManagement/assemblyWorkshop.vue
+++ b/ZR.Vue/src/views/OperationManagement/assemblyWorkshop.vue
@@ -4,8 +4,8 @@
       <div class="title">装配车间生产状态统计</div>
     </div>
     <vxe-table border resizable align="center" ref="xTable" :data="OperationList">
-      <vxe-column field="lineId" title="线体code" width="120" />
-      <vxe-column field="lineName" title="线体名称" width="120" />
+      <vxe-column field="lineId" title="产线编码" width="120" />
+      <vxe-column field="lineName" title="产线名称" width="120" />
       <vxe-column field="productProgressRate" title="生产进度" width="500" :title-help="{ message: '小于20%:红色;小于60%:黄色;大于60%绿色' }">
         <template #default="{ row }">
           <div class="progress">
diff --git a/ZR.Vue/src/views/basisManagement/devicestation.vue b/ZR.Vue/src/views/basisManagement/devicestation.vue
index bae42971..2ab724c5 100644
--- a/ZR.Vue/src/views/basisManagement/devicestation.vue
+++ b/ZR.Vue/src/views/basisManagement/devicestation.vue
@@ -48,10 +48,10 @@
         :row-config="{ isHover: true }"
       >
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="deviceCode" title="设备编码" sortable></vxe-column>
+        <vxe-column field="deviceCode" title="设备编码" width="80"></vxe-column>
         <vxe-column field="deviceName" title="设备名称" sortable></vxe-column>
         <vxe-colgroup title="所属工序">
-          <vxe-column field="workstation.stationCode" title="工序id" width="20"></vxe-column>
+          <vxe-column field="workstation.stationCode" title="工序id" width="80"></vxe-column>
           <vxe-column field="workstation.stationName" title="工序名称"></vxe-column>
         </vxe-colgroup>
 
diff --git a/ZR.Vue/src/views/basisManagement/productEfinition.vue b/ZR.Vue/src/views/basisManagement/productEfinition.vue
index b9c8f0f0..78f664c6 100644
--- a/ZR.Vue/src/views/basisManagement/productEfinition.vue
+++ b/ZR.Vue/src/views/basisManagement/productEfinition.vue
@@ -37,7 +37,7 @@
       <el-table-column label="产品编码" align="center" prop="productCode" />
       <el-table-column label="产品名称" align="center" prop="productName" />
       <el-table-column label="单位" align="center" prop="productUnitName" />
-      <el-table-column label="工艺路线" align="center" prop="processrouteName" />
+      <el-table-column label="线体" align="center" prop="processrouteName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
@@ -142,6 +142,7 @@ import {
   listproductEfinition,
   addProductDefine,
   getUnitmeasure,
+  getProcessroute,
   updateProductDefine,
   getProductBypk,
   delproduct,
@@ -181,8 +182,7 @@ export default {
         measureId: '', //unit表
         productUnit: '', //product表
         productUnitName: '', //product表
-        processrouteCodeName: '',
-        ProcessrouteId: '',
+        workline:null
       },
       rules: {
         productCode: [{ required: true, message: '产品编码不能为空', trigger: 'blur' }],
@@ -327,6 +327,7 @@ export default {
               }
             })
           } else {
+            //新增
             let data = new Object()
             data.productCode = this.dmlform.productCode
             data.productName = this.dmlform.productName
@@ -411,21 +412,34 @@ export default {
       if (queryString == undefined) {
         queryString = ''
       }
-      getUnitmeasure(queryString).then((res) => {
+      getProcessroute(queryString).then((res) => {
         const data = []
         for (let i of res.data) {
           data.push({
-            measureId: i.measureId,
-            value: i.measureName,
+            id:i.id,
+            lineCode: i.lineCode,
+            lineName:i.lineName,
+            value: i.lineCode+"|"+i.lineName,
           })
         }
         //键值对
         cb(data)
       })
     },
+    // 工艺路线选择事件
+    handleProcessrouteNameSelect(data) {   
+     const  str = {
+        id:data.id,
+        lineCode:data.lineCode,
+        lineName:data.lineName
+      }
+
+      
+      this.dmlform.workline=JSON.stringify(str);
+
+
+
 
-    handleProcessrouteNameSelect(row) {
-      this.dmlform.Processroute = row.measureId
     },
 
     //导入excel
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
index 2317ee8a..c6a5a081 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workLine.vue
@@ -48,10 +48,10 @@
         :row-config="{ isHover: true }"
       >
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="lineCode" title="产线编码" sortable></vxe-column>
+        <vxe-column field="lineCode" title="产线编码" width="80"></vxe-column>
         <vxe-column field="lineName" title="产线名称" sortable></vxe-column>
         <vxe-colgroup title="所属车间">
-          <vxe-column field="workshop.workshopId" title="车间id" width="20"></vxe-column>
+          <vxe-column field="workshop.workshopId" title="车间id" width="80"></vxe-column>
           <vxe-column field="workshop.workshopName" title="车间名称"></vxe-column>
         </vxe-colgroup>
 
diff --git a/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue b/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
index 517bec49..f4dee5f8 100644
--- a/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
+++ b/ZR.Vue/src/views/basisManagement/workUnitComponent/workstation.vue
@@ -42,16 +42,20 @@
         ref="xTable1"
         align="center"
         :print-config="{}"
-        :data="table.workshopList"
+        :data="table.workstation"
         :loading="table.loading"
         @checkbox-change="selectChangeEvent"
         :row-config="{ isHover: true }"
       >
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="stationCode" title="工序编码" sortable></vxe-column>
+        <vxe-column field="stationCode" title="工序编码" width="80"></vxe-column>
         <vxe-column field="stationName" title="工序名称" sortable></vxe-column>
         <vxe-colgroup title="所属产线">
-          <vxe-column field="workline.lineCode" title="产线id"></vxe-column>
+          <vxe-column field="workline.lineCode" title="产线id" width="80"></vxe-column>
+          <vxe-column field="workline.lineName" title="产线名称"></vxe-column>
+        </vxe-colgroup>
+        <vxe-colgroup title="所属车间">
+          <vxe-column field="workline.lineCode" title="产线id" width="80"></vxe-column>
           <vxe-column field="workline.lineName" title="产线名称"></vxe-column>
         </vxe-colgroup>
         <vxe-column title="操作" show-overflow>
@@ -76,12 +80,12 @@
     <el-dialog :title="DMLdialog.title" :visible.sync="DMLdialog.visiable" width="600px" append-to-body>
       <el-form ref="DMLdialog" :model="DMLdialog.form" label-width="150px" label-position="left" :rules="DMLdialog.rules">
         <el-form-item label="工序编码 " prop="stationCode">
-          <el-input v-model="DMLdialog.form.stationCode" placeholder="输入工序编码"></el-input>
+          <el-input v-model="DMLdialog.form.stationCode" placeholder="输入工序编码" ></el-input>
         </el-form-item>
         <el-form-item label="工序名称 " prop="stationName">
           <el-input v-model="DMLdialog.form.stationName" placeholder="输入工序名称"></el-input>
         </el-form-item>
-        <el-form-item label="产线 " >
+        <el-form-item label="产线 ">
           <el-select v-model="DMLdialog.form.fkWorklineId" placeholder="请选择产线">
             <el-option
               v-for="item in DMLdialog.workLineOption"
@@ -116,7 +120,7 @@ export default {
       //表格
       table: {
         loading: true,
-        workshopList: [],
+        workstation: [],
       },
       //分页
       pagination: {
@@ -160,7 +164,7 @@ export default {
         if (res.code == 200) {
           this.table.loading = false
           this.pagination.total = res.data.item1
-          this.table.workshopList = res.data.item2
+          this.table.workstation = res.data.item2
         }
       })
     },