From 21f8703da5dbcb7c9e7b45ef1d3b028edfdbed09 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Wed, 26 Feb 2025 09:27:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/outstockOrderCopy/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/outstockOrderCopy/index.vue b/src/views/wms/outstockOrderCopy/index.vue
index 7f5058b..a8fcb42 100644
--- a/src/views/wms/outstockOrderCopy/index.vue
+++ b/src/views/wms/outstockOrderCopy/index.vue
@@ -284,7 +284,7 @@
     <el-dialog v-model="parentTableInfoVisible" title="修改父表格" width="40%">
       <el-form :model="parentTableInfoForm" label-width="120px">
         <el-form-item label="仓库ID" prop="warehouseId">
-          <el-select v-model="parentTableInfoForm.warehouseId" placeholder="请选择所属仓库">
+          <el-select v-model="parentTableInfoForm.warehouseId" placeholder="请选择所属仓库" :disabled="true">
             <el-option
               v-for="item in baseStoreList"
               :key="item.warehouseId"
@@ -304,7 +304,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="物料大类" prop="materialCategories">
-          <el-select v-model="parentTableInfoForm.materialCategories" placeholder="请选择物料大类">
+          <el-select v-model="parentTableInfoForm.materialCategories" placeholder="请选择物料大类" :disabled="true">
             <el-option
                 v-for="dict in material_mategories"
                 :key="dict.value"
@@ -314,7 +314,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工单类型" prop="orderType">
-          <el-select v-model="parentTableInfoForm.orderType" placeholder="请选择工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)">
+          <el-select v-model="parentTableInfoForm.orderType" placeholder="请选择工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)" :disabled="true">
             <el-option
                 v-for="dict in wms_instock_type"
                 :key="dict.value"
@@ -324,7 +324,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="审核人" prop="auditBy">
-          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人">
+          <el-select v-model="parentTableInfoForm.auditBy" placeholder="请选择审核人" :disabled="true">
             <el-option
               v-for="item in userList"
               :key="item.userId"

From bc8709b798f6d6cdbe48aec8bbd2578e809da806 Mon Sep 17 00:00:00 2001
From: "maxw@mesnac.com" <maxw0809##>
Date: Wed, 26 Feb 2025 09:28:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/instockOrderCopy/index.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue
index 0be399b..1e26ccd 100644
--- a/src/views/wms/instockOrderCopy/index.vue
+++ b/src/views/wms/instockOrderCopy/index.vue
@@ -134,7 +134,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" width="200">
           <template #default="scope">
-           <el-button size="small" @click="childrenTableUpdate( scope.row)">
+           <el-button size="small" @click="childrenTableUpdate( scope.row)" v-if="auditStatusLoad">
             打印
             </el-button>
             <el-button
@@ -532,8 +532,8 @@ listUser().then(e => {
   userList.value = e.rows;
 })
 /** 提交按钮 */
-const submitForm = () => {  
-     updateInstockDetail(childrenTableInfoForm.value);
+const submitForm = async() => {  
+  await updateInstockDetail(childrenTableInfoForm.value);
      getChildrenTable({instockId: partntTableSelectCell.value.instockId});
      childrenTableInfoVisible.value = false;  
     }
@@ -549,19 +549,26 @@ const getParentTable = async () => {
     if (e.rows.length > 0) {
       parentTableRef.value.setCurrentRow(e.rows[0])
 
-      await getChildrenTable({instockId: e.rows[0].instockId})
+      await getChildrenTable({instockId: e.rows[0].instockId,auditStatus: e.rows[0].auditStatus})
     } else {
       childrenTableData.value = []
     }
   })
 }
-
+const auditStatusLoad = ref(false)
 // 获取子表格数据
 const getChildrenTable = async (form) => {
+  console.log(form.auditStatus)
+  if(form.auditStatus == 1){
+    auditStatusLoad.value = true;
+  }else{
+    auditStatusLoad.value = false;
+  }
   childrenTableLoad.value = true
   console.log(form)
   await listInstockDetail(form).then(e => {
     childrenTableLoad.value = false
+    console.log(e.rows)
     childrenTableData.value = e.rows
     // parentTableTotal.value = e.total
   })
@@ -594,7 +601,7 @@ const reset = () => {
 // 父表格行点击
 const parentTableCellClick = async (e) => {
   partntTableSelectCell.value = e
-  await getChildrenTable({instockId: e.instockId})
+  await getChildrenTable({instockId: e.instockId,auditStatus: e.auditStatus})
 }
 
 // 表格多选

From ceab46627ebaae7977c626339d5a38f209b34fbc Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 26 Feb 2025 17:17:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?update=20=E7=A1=AB=E5=8C=96=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=88=86=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E6=A8=A1=E7=89=A9=E6=96=99=E3=80=81BOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/planInfo/types.ts               |   9 +
 src/views/mes/planInfo/index.vue            | 189 +++++++++++---------
 src/views/system/masterDataDetail/index.vue |   8 +-
 3 files changed, 116 insertions(+), 90 deletions(-)

diff --git a/src/api/mes/planInfo/types.ts b/src/api/mes/planInfo/types.ts
index bf637ae..cf034cd 100644
--- a/src/api/mes/planInfo/types.ts
+++ b/src/api/mes/planInfo/types.ts
@@ -323,6 +323,15 @@ export interface PlanInfoForm extends BaseEntity {
 
   materialBoMName?: string | number;
 
+  materialIdL?: string | number;
+  materialNameL?: string | number;
+  materialIdR?: string | number;
+  materialNameR?: string | number;
+  materialBoMIdL?: string | number;
+  materialBoMNameL?: string | number;
+  materialBoMIdR?: string | number;
+  materialBoMNameR?: string | number;
+
 }
 
 export interface PlanInfoQuery extends PageQuery {
diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue
index 3fe094a..9cc39e5 100644
--- a/src/views/mes/planInfo/index.vue
+++ b/src/views/mes/planInfo/index.vue
@@ -361,7 +361,8 @@
 
     <!-- 添加物料BOM信息对话框 -->
     <el-dialog title='选择物料BOM信息' v-model='materialBomOpen' append-to-body>
-      <BomSelect @selection='handleSelection' ref='bomSelectRef' v-if='materialBomOpen' :materialIdForm="materialIdForm" ></BomSelect>
+      <BomSelect @selection='handleSelection' ref='bomSelectRef' v-if='materialBomOpen'
+                 :materialIdForm='materialIdForm'></BomSelect>
       <div slot='footer' class='dialog-footer'>
         <el-button type='primary' @click='submitMaterialBomForm'>确 定</el-button>
         <el-button @click='materialBomOpen = false'>取 消</el-button>
@@ -600,7 +601,7 @@
     </el-dialog>
 
     <!-- 批量添加硫化计划信息对话框 -->
-    <el-dialog v-model='vulBatchDialog.visible' width='1200px' append-to-body>
+    <el-dialog v-model='vulBatchDialog.visible' width='1300px' append-to-body>
       <template #header='{ close, titleId, titleClass }'>
         <div class='my-header'>
           {{ vulBatchDialog.title }}
@@ -639,8 +640,32 @@
             <el-form ref='planInfoFormRef' :model='form' :rules='rules' label-width='100px'>
               <el-row :gutter='10' class='mb8'>
                 <el-col :span='12'>
-                  <el-form-item label='物料名称' prop='materialId'>
-                    <el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd'
+                  <el-form-item label='计划时间' prop='planBeginTime'>
+                    <el-date-picker clearable
+                                    v-model='form.planBeginTime'
+                                    type='date'
+                                    value-format='YYYY-MM-DD HH:mm:ss'
+                                    placeholder='请选择计划时间'>
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span='12'>
+                  <el-form-item label='班组' prop='classTeamId'>
+                    <el-select v-model='form.classTeamId' placeholder='请选择班组'>
+                      <el-option
+                        v-for='item in classTeamList'
+                        :key='item.classTeamId'
+                        :label='item.teamName'
+                        :value='item.classTeamId'
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter='10' class='mb8'>
+                <el-col :span='12'>
+                  <el-form-item label='左模物料' prop='materialNameL'>
+                    <el-input v-model='form.materialNameL' placeholder='请点击检索物料' @click='handleMaterialAdd("L")'
                               readonly>
                       <template #append>
                         <el-icon class='el-input__icon'>
@@ -651,9 +676,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span='12'>
-                  <el-form-item label='物料BOM' prop='materialBoMName'>
-                    <el-input v-model='form.materialBoMName' placeholder='请点击检索物料BOM'
-                              @click='handleMaterialBomAdd'
+                  <el-form-item label='右模物料' prop='materialNameR'>
+                    <el-input v-model='form.materialNameR' placeholder='请点击检索物料' @click='handleMaterialAdd("R")'
                               readonly>
                       <template #append>
                         <el-icon class='el-input__icon'>
@@ -664,74 +688,34 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <!--            <el-row :gutter='10' class='mb8'>-->
-              <!--              <el-col :span='12'>-->
-              <!--                <el-form-item label='工序名称' prop='processId'>-->
-              <!--                  <el-select v-model='form.processId' placeholder='请选择工序'>-->
-              <!--                    <el-option-->
-              <!--                      v-for='item in processList'-->
-              <!--                      :key='item.processId'-->
-              <!--                      :label='item.processName'-->
-              <!--                      :value='item.processId'-->
-              <!--                    />-->
-              <!--                  </el-select>-->
-              <!--                </el-form-item>-->
-              <!--              </el-col>-->
-              <!--              <el-col :span='12'>-->
-              <!--        <el-form-item label='下达类型' prop='releaseType'>-->
-              <!--          <el-radio-group v-model='form.releaseType' :disabled='true'>-->
-              <!--            <el-radio-->
-              <!--              v-for='dict in mes_release_type'-->
-              <!--              :key='dict.value'-->
-              <!--              :value='dict.value'-->
-              <!--            >{{ dict.label }}-->
-              <!--            </el-radio>-->
-              <!--          </el-radio-group>-->
-              <!--        </el-form-item>-->
-              <!--                <el-form-item label='机台名称' prop='releaseId'>-->
-              <!--                  <el-select v-model='form.releaseId' placeholder='请选择机台名称'>-->
-              <!--                    <el-option-->
-              <!--                      v-for='item in releaseList'-->
-              <!--                      :key='item.machineId'-->
-              <!--                      :label='item.machineName'-->
-              <!--                      :value='item.machineId'-->
-              <!--                    />-->
-              <!--                  </el-select>-->
-              <!--                </el-form-item>-->
-              <!--              </el-col>-->
-              <!--            </el-row>-->
               <el-row :gutter='10' class='mb8'>
                 <el-col :span='12'>
-                  <el-form-item label='计划时间' prop='planBeginTime'>
-                    <el-date-picker clearable
-                                    v-model='form.planBeginTime'
-                                    type='date'
-                                    value-format='YYYY-MM-DD HH:mm:ss'
-                                    placeholder='请选择计划时间'>
-                    </el-date-picker>
+                  <el-form-item label='左模BOM' prop='materialBoMNameL'>
+                    <el-input v-model='form.materialBoMNameL' placeholder='请点击检索物料BOM'
+                              @click='handleMaterialBomAdd("L")'
+                              readonly>
+                      <template #append>
+                        <el-icon class='el-input__icon'>
+                          <search />
+                        </el-icon>
+                      </template>
+                    </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span='12'>
-                  <!--                  <el-form-item label='计划结束时间' prop='planEndTime'>-->
-                  <!--                    <el-date-picker clearable-->
-                  <!--                                    v-model='form.planEndTime'-->
-                  <!--                                    type='date'-->
-                  <!--                                    value-format='YYYY-MM-DD HH:mm:ss'-->
-                  <!--                                    placeholder='请选择计划结束时间'>-->
-                  <!--                    </el-date-picker>-->
-                  <!--                  </el-form-item>-->
+                  <el-form-item label='右模BOM' prop='materialBoMNameR'>
+                    <el-input v-model='form.materialBoMNameR' placeholder='请点击检索物料BOM'
+                              @click='handleMaterialBomAdd("R")'
+                              readonly>
+                      <template #append>
+                        <el-icon class='el-input__icon'>
+                          <search />
+                        </el-icon>
+                      </template>
+                    </el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
-              <el-form-item label='班组' prop='classTeamId'>
-                <el-select v-model='form.classTeamId' placeholder='请选择班组'>
-                  <el-option
-                    v-for='item in classTeamList'
-                    :key='item.classTeamId'
-                    :label='item.teamName'
-                    :value='item.classTeamId'
-                  />
-                </el-select>
-              </el-form-item>
               <el-row :gutter='10' class='mb8'>
                 <el-col :span='12'>
                   <el-form-item label='左模早班数量' prop='planAmount1'>
@@ -880,6 +864,8 @@ const machineIds = ref<Array<string | number>>([]);
 
 const machineQueryParams = ref({});
 
+const modelCodeRef = ref();
+
 /*获取班次下拉框*/
 const getShiftSelect = async () => {
   let res = await getBaseShiftInfoList(null);
@@ -1188,6 +1174,8 @@ const batchesAddAssemblyData = () => {
   if (formData.planAmount1 > 0) {
     let data = { ...formData };
     data.modelCode = formData.workshopId === '4' ? 'L' : null;
+    data.materialId = formData.workshopId === '4' ? formData.materialIdL : formData.materialId;
+    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdL : formData.materialBomId;
     data.shiftId = '1';
     data.planAmount = formData.planAmount1;
     list.push(data);
@@ -1197,6 +1185,8 @@ const batchesAddAssemblyData = () => {
     data.modelCode = formData.workshopId === '4' ? 'L' : null;
     data.shiftId = '2';
     data.planAmount = formData.planAmount2;
+    data.materialId = formData.workshopId === '4' ? formData.materialIdL : formData.materialId;
+    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdL : formData.materialBomId;
     list.push(data);
   }
   if (formData.planAmount3 > 0) {
@@ -1204,6 +1194,8 @@ const batchesAddAssemblyData = () => {
     data.modelCode = formData.workshopId === '4' ? 'L' : null;
     data.shiftId = '3';
     data.planAmount = formData.planAmount3;
+    data.materialId = formData.workshopId === '4' ? formData.materialIdL : formData.materialId;
+    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdL : formData.materialBomId;
     list.push(data);
   }
   if (formData.planAmount4 > 0) {
@@ -1211,6 +1203,8 @@ const batchesAddAssemblyData = () => {
     data.modelCode = 'R';
     data.shiftId = '1';
     data.planAmount = formData.planAmount4;
+    data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
+    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdR : formData.materialBomId;
     list.push(data);
   }
   if (formData.planAmount5 > 0) {
@@ -1218,6 +1212,8 @@ const batchesAddAssemblyData = () => {
     data.modelCode = 'R';
     data.shiftId = '2';
     data.planAmount = formData.planAmount5;
+    data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
+    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdR : formData.materialBomId;
     list.push(data);
   }
   if (formData.planAmount6 > 0) {
@@ -1225,6 +1221,8 @@ const batchesAddAssemblyData = () => {
     data.modelCode = 'R';
     data.shiftId = '3';
     data.planAmount = formData.planAmount6;
+    data.materialId = formData.workshopId === '4' ? formData.materialIdR : formData.materialId;
+    data.materialBomId = formData.workshopId === '4' ? formData.materialBomIdR : formData.materialBomId;
     list.push(data);
   }
   return list;
@@ -1256,37 +1254,56 @@ const handleExport = () => {
   }, `planInfo_${new Date().getTime()}.xlsx`);
 };
 
+/** 新增物料按钮操作 */
+const handleMaterialAdd = (modelCode) => {
+  modelCodeRef.value = modelCode;
+  materialOpen.value = true;
+};
+
+/** 提交物料信息按钮 */
+const submitMaterialForm = () => {
+  let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
+  if (modelCodeRef.value === 'L') {
+    form.value.materialIdL = selectedRow.materialId;
+    form.value.materialNameL = selectedRow.materialName;
+  } else if (modelCodeRef.value === 'R') {
+    form.value.materialIdR = selectedRow.materialId;
+    form.value.materialNameR = selectedRow.materialName;
+  } else {
+    form.value.materialId = selectedRow.materialId;
+    form.value.materialName = selectedRow.materialName;
+  }
+  materialIdForm.value = selectedRow.materialId;
+  materialOpen.value = false;
+};
+
 /** 新增物料BOM按钮操作 */
-const handleMaterialBomAdd = () => {
-  if (form.value.materialId == null){
+const handleMaterialBomAdd = (modelCode) => {
+  if (form.value.materialId == null && form.value.materialIdL == null
+    && form.value.materialIdR == null) {
     proxy?.$modal.msgWarning('请先选择物料！');
     return;
   }
+  modelCodeRef.value = modelCode;
   materialBomOpen.value = true;
 };
 
 /** 提交物料BOM信息按钮 */
 const submitMaterialBomForm = () => {
   let selectedRow = bomSelectRef.value.tableRef.store.states.currentRow.value;
-  form.value.materialBomId = selectedRow.materialBomId;
-  form.value.materialBoMName = selectedRow.materialName;
+  if (modelCodeRef.value === 'L') {
+    form.value.materialBomIdL = selectedRow.materialBomId;
+    form.value.materialBoMNameL = selectedRow.materialName;
+  } else if (modelCodeRef.value === 'R') {
+    form.value.materialBomIdR = selectedRow.materialBomId;
+    form.value.materialBoMNameR = selectedRow.materialName;
+  } else {
+    form.value.materialBomId = selectedRow.materialBomId;
+    form.value.materialBoMName = selectedRow.materialName;
+  }
   materialBomOpen.value = false;
 };
 
-/** 新增按钮操作 */
-const handleMaterialAdd = () => {
-  materialOpen.value = true;
-};
-
-/** 提交物料BOM信息按钮 */
-const submitMaterialForm = () => {
-  let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
-  form.value.materialId = selectedRow.materialId;
-  form.value.materialName = selectedRow.materialName;
-  materialIdForm.value =selectedRow.materialId;
-  materialOpen.value = false;
-};
-
 /** 搜索机台信息按钮操作 */
 function handleMachineQuery() {
   getReleaseSelect();
diff --git a/src/views/system/masterDataDetail/index.vue b/src/views/system/masterDataDetail/index.vue
index 560641e..daf1705 100644
--- a/src/views/system/masterDataDetail/index.vue
+++ b/src/views/system/masterDataDetail/index.vue
@@ -116,10 +116,10 @@
 <!--          <el-input v-model='form.ancestors' placeholder='请输入祖级列表'/>-->
 <!--        </el-form-item>-->
         <el-form-item :label='masterDataTitle + "编号"' prop='dataDetailCode'>
-          <el-input v-model='form.dataDetailCode' placeholder='请输入主数据明细编号'/>
+          <el-input v-model='form.dataDetailCode' :placeholder='"请输入" + masterDataTitle+ "编号"'/>
         </el-form-item>
         <el-form-item :label='masterDataTitle + "名称"' prop='dataDetailName'>
-          <el-input v-model='form.dataDetailName' placeholder='请输入主数据明细名称'/>
+          <el-input v-model='form.dataDetailName' :placeholder='"请输入" + masterDataTitle+ "名称"'/>
         </el-form-item>
         <el-form-item :label='i.label' :prop='i.tableKey' v-for="i in reservedFieldList">
           <el-input v-model='form[i.tableKey]' placeholder='请输入预留字段1数据'/>
@@ -246,10 +246,10 @@ const data = reactive<PageData<MasterDataDetailForm, MasterDataDetailQuery>>({
   },
   rules: {
     dataDetailCode: [
-      {required: true, message: '主数据明细编号不能为空', trigger: 'blur'}
+      {required: true, message: '编号不能为空', trigger: 'blur'}
     ],
     dataDetailName: [
-      {required: true, message: '主数据明细名称不能为空', trigger: 'blur'}
+      {required: true, message: '名称不能为空', trigger: 'blur'}
     ],
     activeFlag: [
       {required: true, message: '激活标识不能为空', trigger: 'change'}