From 32a27bc29d1e07428e51de74adafefd8e29efcd4 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 09:10:19 +0800
Subject: [PATCH 01/34] =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 4b57d7850..dde325e83 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -404,5 +404,5 @@ export enum DICT_TYPE {
   RETURN_REASON_TYPE = 'return_reason_type',  // 采购退货原因类型
   SCRAPPING_REASON = 'scrapping_reason',  //制品子件报废原因
   RECEIVE_STATUS = 'receive_status',  // 收货确认状态
-  LINE_SCRAP_REASON = 'line_scrap_reason',  // 线边报废原因
+  LINE_SCRAP_REASON = 'Reason_or_scrapping_of_production_line',  // 线边报废原因(现场史力维护的字典)
 }

From 9569655f7f2f58cf56f045459de09962a3428b97 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 09:28:20 +0800
Subject: [PATCH 02/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts        | 148 +++++++++++++++++-
 1 file changed, 146 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index f8d54babe..5b857b746 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -26,6 +26,15 @@ import { TableColumn } from '@/types/table'
 import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
 import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 // import * as LocationApi from '@/api/wms/location'
 // import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
@@ -145,6 +154,137 @@ export const ProductionscrapRequestMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '成本中心代码',
+      field: 'costCenterCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心代码',
+        searchAllSchemas: QadCostcentre.allSchemas,
+        searchPage: QadCostcentreApi.getQadCostcentrePage,
+        verificationParams: [{
+          key: 'costcentreCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心代码', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }],
+          verificationParams: [{
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '成本中心类型',
+      field: 'costCenterType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm:false,
+      isTable:false,
+      isTableForm:false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+    },
+    {
+      label: '原因代码',
+      field: 'reasonCodeRequisition',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成领用原因代码',
+        searchField: 'code',
+        searchTitle: '领用原因代码',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '领用原因代码', // 查询弹窗标题
+          searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+          searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },{
+            key: 'costcentreType',
+            value: 'costCenterType',
+            message: '成本中心类型不能为空!',
+            isMainValue: true
+            }],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '车间',
       field: 'workshopCode',
@@ -281,6 +421,8 @@ export const ProductionscrapRequestMain = useCrudSchemas(
       table: {
         width: 180
       },
+      isForm:false,
+      isTableForm:false,
       isTable: false,
       form: {
         component: 'DatePicker',
@@ -364,7 +506,9 @@ export const ProductionscrapRequestMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isForm:false,
+      isTableForm:false,
+      isTable: false,
     },
     {
       label: '业务类型',
@@ -598,7 +742,7 @@ export const ProductionscrapRequestMainRules = reactive({
     { required: true, message: '请选择车间', trigger: 'change' }
   ],
   productionLineCode: [
-    { required: true, message: '请选择生产线代码', trigger: 'change' }
+    { required: false, message: '请选择生产线代码', trigger: 'change' }
   ],
 })
 

From 53eea9d80f6792965a3f94604a7f20e1c5a85188 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 09:31:38 +0800
Subject: [PATCH 03/34] =?UTF-8?q?HL-5786=E7=BA=BF=E8=BE=B9=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts                     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 5b857b746..0148e27e5 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -828,7 +828,8 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'productionLineCode',
           value: 'productionLineCode',
           message: '请选择生产线信息！',
-          isMainValue: true
+          isMainValue: true,
+          isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
           }],
 
         
@@ -856,7 +857,9 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         key: 'productionLineCode',
         value: 'productionLineCode',
         message: '请选择生产线信息！',
-        isMainValue: true
+        isMainValue: true,
+        isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
+
         }],
       verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
       isShowTableFormSearch: true,

From 492753db1a81e001a75d4a985af65a295e29b8a0 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 09:37:43 +0800
Subject: [PATCH 04/34] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8F=AF=E9=80=89=E5=8F=AF=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index a99e22aa7..a32ee78b6 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -49,7 +49,9 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
                 params.value[searchCondition[i].key] == '' ||
                 params.value[searchCondition[i].key] == undefined
               ) {
-                isNull = true
+                if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断
+                  isNull = true
+                }
               }
               if (isNull) {
                 message.warning(
@@ -58,6 +60,9 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
                 row[headerItem.field] = ''
                 return
               }
+              if(searchCondition[i].isOptional&&!params.value[searchCondition[i].key]){ // 添加参数可选可空的判断
+                continue
+              }
               filters.push({
                 action: searchCondition[i].action || '==',
                 column: searchCondition[i].key,
@@ -493,7 +498,11 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form
             params.value[searchCondition1[i].key] == '' ||
             params.value[searchCondition1[i].key] == undefined
           ) {
-            isNull = true
+              if(!searchCondition1[i].isOptional){ // 添加参数可选可空的判断
+                if(!searchCondition1[i].isOptional){ // 添加参数可选可空的判断
+                  isNull = true
+                }
+              }
           }
           if (isNull) {
             message.warning(

From ee5b1e691b7d300fc3114959f80d92f6a3748452 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 10:12:28 +0800
Subject: [PATCH 05/34] =?UTF-8?q?=20window.open=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Error/src/Error.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Error/src/Error.vue b/src/components/Error/src/Error.vue
index 3fd7a1767..eaffb2d05 100644
--- a/src/components/Error/src/Error.vue
+++ b/src/components/Error/src/Error.vue
@@ -43,13 +43,17 @@ const emit = defineEmits(['errorClick'])
 const btnClick = () => {
   emit('errorClick', props.type)
 }
+const openClick = ()=>{
+  const url = 'http://172.21.32.31:8080/bi/Viwwer?proc=1&action=viewer&hback=true&db=!6210!!90fd!!6d77!!62c9!!62a5!!8868!!2f!!5236!!54c1!!5b50!!4ef6!!62a5!!5e9f!!8bb0!!5f55!.db&platform=PC&browserType=chrome&dbTabVisible=false&dbTabIndex=1&au_act=login&adminv=CC_WMS&passv=123'
+  window.open(url)
+}
 </script>
 
 <template>
   <div class="flex justify-center">
     <div class="text-center">
       <img :src="errorMap[type].url" alt="" width="350" />
-      <div class="text-14px text-[var(--el-color-info)]">{{ errorMap[type].message }}</div>
+      <div class="text-14px text-[var(--el-color-info)]" @click="openClick">{{ errorMap[type].message }}</div>
       <div class="mt-20px">
         <ElButton type="primary" @click="btnClick">{{ errorMap[type].buttonText }}</ElButton>
       </div>

From 051f60610925e46d7a41f75a73292047c7d57448 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 10:17:32 +0800
Subject: [PATCH 06/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain/index.vue      |  7 +++
 .../productionscrapRequestMain.data.ts        | 44 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 14824eb07..8852f511d 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -233,6 +233,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
     } else {
       const setV = {}
+      if(formField == 'costCenterCode'){
+        setV['costcentreCode'] = val[0]['costcentreCode']
+        setV['costCenterType'] = val[0]['costcentreType']
+      }
+      if(formField == 'reasonCodeRequisition'){
+        setV['reasonCodeRequisition'] = val[0]['code']
+      }
       setV[formField] = val[0][searchField]
       tableData.value = [] // 重置明细数据
       formRef.setValues(setV)
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 0148e27e5..a3cabb8b8 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1084,6 +1084,50 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 2,
+      },
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 2,
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 0,
+        precision: 2,
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      disabled:true,
+      min: 0,
+      precision: 2,
+    },
+  },
   {
     label: '库存状态',
     field: 'inventoryStatus',

From 859e988aad898fc82a485ce1cfc4b7591b8eeccc Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 10:35:32 +0800
Subject: [PATCH 07/34] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E5=8D=95=E4=BB=B7=EF=BC=8C=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/stdcostprice/index.ts                 |  2 +-
 .../productionscrapRequestMain/index.vue          | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/api/wms/stdcostprice/index.ts b/src/api/wms/stdcostprice/index.ts
index 3ec273f8e..171b6a907 100644
--- a/src/api/wms/stdcostprice/index.ts
+++ b/src/api/wms/stdcostprice/index.ts
@@ -59,6 +59,6 @@ export const importTemplate = () => {
 
 
 // 查询标准成本价格单列表
-export const queryStdcostpriceByItemCode = async (data: StdcostpriceVO) => {
+export const queryStdcostpriceByItemCode = async (data) => {
   return await request.post({ url: `/wms/stdcostprice/queryStdcostpriceByItemCode`, data })
 }
\ No newline at end of file
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 8852f511d..2f862cd0f 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -59,6 +59,7 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @inputNumberChange="inputNumberChange"
   />
 
   <!-- 详情 -->
@@ -101,6 +102,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { ProductionscrapRequestMain,ProductionscrapRequestMainRules,ProductionscrapRequestDetail,ProductionscrapRequestDetailRules,ProductionscrapRequestDetailLabel,ProductionscrapRequestDetailLabelRules, SupplierdeliverRequestPackage } from './productionscrapRequestMain.data'
 import * as ProductionscrapRequestMainApi from '@/api/wms/productionscrapRequestMain'
@@ -183,7 +185,11 @@ const isItemType = async (itemCode, labelTypeParams) => {
   if (!isType) labelType.value = labelTypeOld
   return isType
 }
-
+const inputNumberChange = (field, index, row, val) => {
+  if(field == 'qty' ){
+    row.amount = Number(Number(row.qty * row.singlePrice).toFixed(2))
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async () => {
@@ -216,6 +222,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
               item.tableForm.max = val[0]['qty']
             }
           })
+          let param = {'itemCodes':val[0]['itemCode']}
+          let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param)
+          console.log('resyStdcost',resyStdcost)
+          if(resyStdcost&&resyStdcost.length>0){
+            row['singlePrice'] = resyStdcost[0].price
+            row['amount'] = Number(Number(resyStdcost[0].price *  row['qty']).toFixed(2))
+          }
         }
       } else if(formField == 'workStationCode') {
         // 明细查询页赋值

From 8aa23797bd8719c2d6f607b22dea15ea4bea2772 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 18 Sep 2024 10:41:28 +0800
Subject: [PATCH 08/34] =?UTF-8?q?HL-5979:SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E3=80=82=E6=89=93=E5=8D=B0=E5=87=BA=E6=8A=B1=E6=80=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturn/purchasereturnRecordMain/index.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 48e60e3f1..4a4db0820 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -136,14 +136,14 @@ const butttondata = (row,$index) => {
   if(findIndex>-1&&findIndex<$index){
     return []
   }
-  // return [defaultButtons.mainListDocumentPrintBtn(null)]
+  return [defaultButtons.mainListDocumentPrintBtn(null)]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'documentPrint') {
     // 单据打印
-    // handleDocumentPrint(row.requestNumber,row.itemCode)
+     handleDocumentPrint(row.requestNumber,row.itemCode)
   }
 }
 

From eb3bb53270bfe423d7f8a3a5f70265135ce3bca3 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Wed, 18 Sep 2024 10:57:58 +0800
Subject: [PATCH 09/34] =?UTF-8?q?HL-6007=E5=8E=BB=E6=8E=89=E6=B2=A1?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRecordMain.data.ts         | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
index 6ff6650f4..4ba2f839b 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMTypeMain/purchasereceiptRecordMain.data.ts
@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 400,
-      fixed: 'right'
-    },
-  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 400,
+  //     fixed: 'right'
+  //   },
+  // },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -456,15 +456,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:16,
   },
-  {
-    label: '检验申请单号',
-    field: 'inspectNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-  },
+  // {
+  //   label: '检验申请单号',
+  //   field: 'inspectNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:6,
+  // },
   {
     label: '数量',
     field: 'qty',
@@ -675,7 +675,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '是否已生成上架申请',
@@ -694,7 +694,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled: true
       }
     },
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '物料类型',
@@ -1224,19 +1224,19 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:2000,
   },
-
-  {
-    label: '操作',
-    hiddenInMain:true,
-    field: 'action',
-    isDetail: false,
-    isForm: false ,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:true,
-  }
+  //
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
 ]))
 
 // 表单校验

From 424ab11740e9b0eb778768f5f1210153681c7a6c Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 11:14:36 +0800
Subject: [PATCH 10/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts        | 48 +++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index a3cabb8b8..a985c19ff 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -1091,6 +1091,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -1113,6 +1114,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -1197,10 +1199,48 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTable:false,
-    hiddenInMain: true,
-    isTableForm: false,
-    isForm: false,
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '选择项目代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage,
+      verificationParams: [{
+        key: 'projectCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '选择项目代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'projectCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
   },
   {
     label: '单据号',

From 0b2aaf9b90cab2a6dd52996811dd636ac0e254c4 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 11:23:21 +0800
Subject: [PATCH 11/34] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue                 |  4 ++--
 .../productionscrapRequestMain/index.vue             | 12 ++++++++++++
 .../productionscrapRequestMain.data.ts               |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index dc0f6fc36..3d21b3965 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -1110,8 +1110,8 @@ const openImage=(item)=>{
  * @param field 当前操作字段
  * @param cur 改变后值
  */
- const detailBasicFormOnChange = (field, cur) => {
-  emit('detailBasicFormOnChange', field, cur)
+ const detailBasicFormOnChange = (field, cur, formRef) => {
+  emit('detailBasicFormOnChange', field, cur, formRef)
 }
 
 /**
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 2f862cd0f..165a6c03e 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -76,6 +76,8 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     @detailOpenForm="detailOpenForm"
     :detailValidate="detailValidate"
+    @detailBasicFormOnChange="qtyOnChange"
+
   />
 
   <!-- 创建标签 -->
@@ -185,6 +187,16 @@ const isItemType = async (itemCode, labelTypeParams) => {
   if (!isType) labelType.value = labelTypeOld
   return isType
 }
+const qtyOnChange = (field, cur, formRef) => {
+  console.log('qtyOnChange',field, cur)
+  console.log(formRef.value)
+  if(field == 'qty' ){
+    const setV = {
+      amount:Number(Number(cur * formRef.value.formModel.singlePrice).toFixed(2))
+    }
+    formRef.value.setValues(setV)
+  }
+}
 const inputNumberChange = (field, index, row, val) => {
   if(field == 'qty' ){
     row.amount = Number(Number(row.qty * row.singlePrice).toFixed(2))
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index a985c19ff..72537c9a9 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -759,6 +759,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     hiddenInMain: true,
     isTableForm: false,
+    isForm:false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -1267,6 +1268,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     isTable:false,
     isTableForm: false,
+    isForm: false,
     tableForm: {
       enterSearch:true,
       isInpuFocusShow: true,
@@ -1326,6 +1328,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     isTable:false,
     isTableForm: false,
+    isForm: false,
     tableForm:{
       disabled: true
     },
@@ -1344,6 +1347,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     isTable:false,
     isTableForm: false,
+    isForm: false,
     tableForm: {
       disabled: true
     },

From 7c4fef38af77b2b158769d43955e758d23d237ab Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 13:52:07 +0800
Subject: [PATCH 12/34] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95--=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRecordMain.data.ts                       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index c931b3c69..140034cb6 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -557,6 +557,8 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    hiddenInMain: true,
   },
   {
     label: '从库位组代码',
@@ -574,6 +576,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true,
   },
   {
@@ -592,6 +595,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
     hiddenInMain: true,
   },
   {
@@ -643,8 +647,6 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    isTable:false,
-    hiddenInMain: true,
   },
   {
     label: '单据号',

From 0120004b3d6fe27fd56ef133887ee44bf572c888 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 13:58:02 +0800
Subject: [PATCH 13/34] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95--=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRecordMain.data.ts         | 159 ++++++++++++++++++
 1 file changed, 159 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
index 140034cb6..beee18e09 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts
@@ -4,6 +4,15 @@ import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import * as InspectionQ3Api from '@/api/qms/inspectionQ3/inspectionQ3Main'
 import { InspectionQ3Main } from '@/views/qms/inspectionQ3/inspectionQ3.data'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 /**
  * @returns {Array} 生产退料记录主表
  */
@@ -72,6 +81,156 @@ export const ProductionscrapRecordMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '报废原因',
+      field: 'lineScrapReason',
+      dictType: DICT_TYPE.LINE_SCRAP_REASON,
+      dictClass: 'string',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          filterable: true
+        }
+      },
+      tableForm: {
+        type: 'Select',
+        filterable: true
+      }
+    },
+    {
+      label: '成本中心代码',
+      field: 'costCenterCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码',
+        searchField: 'costcentreCode',
+        searchTitle: '成本中心代码',
+        searchAllSchemas: QadCostcentre.allSchemas,
+        searchPage: QadCostcentreApi.getQadCostcentrePage,
+        verificationParams: [{
+          key: 'costcentreCode',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+          searchField: 'costcentreCode', // 查询弹窗赋值字段
+          searchTitle: '成本中心代码', // 查询弹窗标题
+          searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+          searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }],
+          verificationParams: [{
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
+    {
+      label: '成本中心类型',
+      field: 'costCenterType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm:false,
+      isTable:false,
+      isTableForm:false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+    },
+    {
+      label: '原因代码',
+      field: 'reasonCodeRequisition',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        enterSearch: true,
+        isInpuFocusShow: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成领用原因代码',
+        searchField: 'code',
+        searchTitle: '领用原因代码',
+        searchAllSchemas: SubjectAccount.allSchemas,
+        searchPage: SubjectAccountApi.getSubjectAccountPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择领用原因代码', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '领用原因代码', // 查询弹窗标题
+          searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+          searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+          searchCondition: [{
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          },{
+            key: 'costcentreType',
+            value: 'costCenterType',
+            message: '成本中心类型不能为空!',
+            isMainValue: true
+            }],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '车间代码',
       field: 'workshopCode',

From b905eba004b7ee736b43e29901b04fb0654f00ea Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 14:00:42 +0800
Subject: [PATCH 14/34] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Error/src/Error.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/Error/src/Error.vue b/src/components/Error/src/Error.vue
index eaffb2d05..3fd7a1767 100644
--- a/src/components/Error/src/Error.vue
+++ b/src/components/Error/src/Error.vue
@@ -43,17 +43,13 @@ const emit = defineEmits(['errorClick'])
 const btnClick = () => {
   emit('errorClick', props.type)
 }
-const openClick = ()=>{
-  const url = 'http://172.21.32.31:8080/bi/Viwwer?proc=1&action=viewer&hback=true&db=!6210!!90fd!!6d77!!62c9!!62a5!!8868!!2f!!5236!!54c1!!5b50!!4ef6!!62a5!!5e9f!!8bb0!!5f55!.db&platform=PC&browserType=chrome&dbTabVisible=false&dbTabIndex=1&au_act=login&adminv=CC_WMS&passv=123'
-  window.open(url)
-}
 </script>
 
 <template>
   <div class="flex justify-center">
     <div class="text-center">
       <img :src="errorMap[type].url" alt="" width="350" />
-      <div class="text-14px text-[var(--el-color-info)]" @click="openClick">{{ errorMap[type].message }}</div>
+      <div class="text-14px text-[var(--el-color-info)]">{{ errorMap[type].message }}</div>
       <div class="mt-20px">
         <ElButton type="primary" @click="btnClick">{{ errorMap[type].buttonText }}</ElButton>
       </div>

From 326a6c73431a455ef01acc6985c050b41a0874e1 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 14:44:47 +0800
Subject: [PATCH 15/34] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1-?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countManage/count/countJobMain/index.vue  | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index a00cc0ced..49d33490a 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -326,17 +326,22 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   // 盲盘的时候不显示数量
-  countJobDetailTableColumns.value.tableColumns = []
+  // countJobDetailTableColumns.value.tableColumns = []
+  // if (ro.isOpenCount == "FALSE") {
+  //   CountJobDetail.allSchemas.tableColumns.forEach((item) => {
+  //     if (item.field != 'qty') {
+  //       countJobDetailTableColumns.value.tableColumns.push(item)
+  //     }
+  //   })
+  // } else {
+  //   countJobDetailTableColumns.value.tableColumns = JSON.parse(
+  //     JSON.stringify(CountJobDetail.allSchemas.tableColumns)
+  //   )
+  // }w
   if (row.isOpenCount == "FALSE") {
-    CountJobDetail.allSchemas.tableColumns.forEach((item) => {
-      if (item.field != 'qty') {
-        countJobDetailTableColumns.value.tableColumns.push(item)
-      }
-    })
-  } else {
-    countJobDetailTableColumns.value.tableColumns = JSON.parse(
-      JSON.stringify(CountJobDetail.allSchemas.tableColumns)
-    )
+    countJobDetailTableColumns.value.tableColumns = CountJobDetail.allSchemas.tableColumns.filter(item=>item.field != 'qty')
+  }else{
+    countJobDetailTableColumns.value.tableColumns = CountJobDetail.allSchemas.tableColumns.filter(item=>item.field)
   }
 
   detailRef.value.openDetail(row, titleName, titleValue, 'jobCountMain')

From f1f1876545a69b3cba20b095d060b3b7f3438fd5 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Wed, 18 Sep 2024 15:20:59 +0800
Subject: [PATCH 16/34] =?UTF-8?q?HL-6014=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A21.=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=EF=BC=8C=E5=BA=94=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=BE=93=E5=85=A5=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain/customerreturnRequestMain.data.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 8ab2566c3..8e3e867a6 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -1041,6 +1041,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true,
     tableForm: {
       enterSearch:true,
+      isRepeat: true,
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择到库位代码',
       searchField: 'toLocationCode',

From 998f944645dc83842c3a72e83cc4ade736091a55 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 15:25:15 +0800
Subject: [PATCH 17/34] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 72537c9a9..5c99beb99 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -72,6 +72,25 @@ export const ProductionscrapRequestMain = useCrudSchemas(
       isForm: false,
       isSearch: true
     },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        value: '1',
+        componentProps: {
+          disabled: true
+        }
+      }
+    },
     {
       label: 'Q3通知单号',
       field: 'q3Number',
@@ -135,25 +154,6 @@ export const ProductionscrapRequestMain = useCrudSchemas(
         filterable: true
       }
     },
-    {
-      label: '状态',
-      field: 'status',
-      dictType: DICT_TYPE.REQUEST_STATUS,
-      dictClass: 'string',
-      isSearch: true,
-      isTable: true,
-      isForm: false,
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        value: '1',
-        componentProps: {
-          disabled: true
-        }
-      }
-    },
     {
       label: '成本中心代码',
       field: 'costCenterCode',

From 812dbdd2c97f0417870eb90e53966dfaf95a1ba9 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Wed, 18 Sep 2024 15:24:55 +0800
Subject: [PATCH 18/34] HL-6034

---
 src/api/wms/saleShipmentMain/index.ts         |  6 ------
 src/api/wms/saleShipmentMainRecord/index.ts   |  4 ++++
 src/utils/disposition/defaultButtons.ts       |  4 ++--
 .../saleShipmentMainRecord/index.vue          | 13 +++++++++++++
 .../saleShipmentMainRecord.data.ts            | 19 +++++++++----------
 .../saleShipmentMainRequest/index.vue         | 14 +-------------
 6 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts
index b0b6b60b5..a3e3c94eb 100644
--- a/src/api/wms/saleShipmentMain/index.ts
+++ b/src/api/wms/saleShipmentMain/index.ts
@@ -98,9 +98,3 @@ export const agree = async (id) => {
 export const handle = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id })
 }
-
-// 处理-结算出库废弃
-export const abort = async (id) => {
-  return await request.put({ url: `/wms/sale-shipment-main-request/abort?id=` + id })
-}
-
diff --git a/src/api/wms/saleShipmentMainRecord/index.ts b/src/api/wms/saleShipmentMainRecord/index.ts
index d21937a41..dc193daa9 100644
--- a/src/api/wms/saleShipmentMainRecord/index.ts
+++ b/src/api/wms/saleShipmentMainRecord/index.ts
@@ -60,3 +60,7 @@ export const exportSaleShipmentMainRecord = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' })
 }
+// 处理-结算出库撤销
+export const abort = async (id) => {
+  return await request.put({ url: `/wms/sale-shipment-main-record/abort?id=` + id })
+}
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 5fe8852ca..8d9ec527d 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -648,8 +648,8 @@ export function mainListHandleBtn(option: any) {
 // 主列表-申请流程-作废按钮
 export function mainListAbortBtn(option: any) {
   return __defaultBtnOption(option, {
-    label: t(`ts.终止`).replace('ts.', ''),
-    name: 'mainAbort',
+    label: t(`ts.撤销`).replace('ts.', ''),
+    name: 'abort',
     hide: false,
     type: 'primary',
     color: '',
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index 9509e5a9b..4e83e6db6 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -74,6 +74,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as saleShipmentMainRecordApi from "@/api/wms/saleShipmentMainRecord";
 const { loadStart, loadDone } = usePageLoading()
 defineOptions({ name: 'SaleShipmentMainRecord' })
 
@@ -146,6 +147,7 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
+  defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort'}), // 撤销
 ]
 
 // 列表-操作按钮事件
@@ -154,6 +156,17 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  }  else if (val == 'abort') { // 终止
+    await message.confirm('确认要撤销吗？')
+    tableObject.loading = true
+    saleShipmentMainRecordApi.abort(row.masterId).then(() => {
+      message.success(t('common.updateSuccess'))
+      tableObject.loading = false
+      buttonBaseClick('refresh',null)
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index 9c9b9e88b..b2d8dc569 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -91,7 +91,6 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable:false
   },
@@ -146,15 +145,15 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isTable:false
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isForm: false,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   }
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 0846beac2..7f8cff2c0 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -249,7 +249,6 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
     defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过
     defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理
-    // defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除
   ]
 }
@@ -324,18 +323,7 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
-  } else if (val == 'mainAbort') { // 结算出库废弃
-    await message.confirm('确认要终止吗？')
-    tableObject.loading = true
-    SaleShipmentMainApi.abort(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      tableObject.loading = false
-      buttonBaseClick('refresh',null)
-    }).catch(err => {
-      tableObject.loading = false
-      console.log(err)
-    })
-  }else if (val == 'edit') { // 编辑
+  } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)

From d663209b65bee5a6f9641fe43abca9d0269d7c3f Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 18 Sep 2024 15:35:02 +0800
Subject: [PATCH 19/34] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95-=E6=92=A4=E9=94=80=E6=B7=BB=E5=8A=A0relateRe?=
 =?UTF-8?q?cordNumber=20=20revokeFlag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleShipmentMainRecord/index.vue          | 24 +++++++++++------
 .../saleShipmentMainRecord.data.ts            | 27 +++++++++++++++++++
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index 4e83e6db6..b38c26706 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -33,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row, $index }">
+        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -142,13 +142,21 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
 // 列表-操作按钮
-const butttondata = [
-  // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
-  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
-  defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort'}), // 撤销
-]
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  }
+  return [
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
+    defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:row.revokeFlag=='TRUE'}), // 撤销
+  ]
+}
+
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index b2d8dc569..6afc3ec22 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -32,6 +32,33 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     }
   },
+  {
+    label: '关联单据号',
+    field: 'relateRecordNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否已撤销',
+    field: 'revokeFlag',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    table: {
+      width: 150
+    },
+    detail:{
+      // dictType:'primary',
+      // valueFilter:(value)=>{
+      //   if(value=='TRUE'){
+      //     return `是`
+      //   }else{
+      //     return '否'
+      //   }
+      // }
+    }
+  },
   {
     label: '发票时间',
     field: 'invoiceTime',

From 04dcf0ee723d843e29b30734bc6e1e3dea3839b3 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 18 Sep 2024 15:40:16 +0800
Subject: [PATCH 20/34] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts                   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 5c99beb99..01e14deae 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -744,6 +744,15 @@ export const ProductionscrapRequestMainRules = reactive({
   productionLineCode: [
     { required: false, message: '请选择生产线代码', trigger: 'change' }
   ],
+  lineScrapReason: [
+    { required: true, message: '请选择报废原因', trigger: 'change' }
+  ],
+  costCenterCode: [
+    { required: true, message: '请选择成本中心代码', trigger: 'change' }
+  ],
+  reasonCodeRequisition: [
+    { required: true, message: '请选择原因代码', trigger: 'change' }
+  ],
 })
 
 /**

From 6f148720dbd7b2cbbae0df10f018b7fe9ec7137b Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Wed, 18 Sep 2024 15:54:31 +0800
Subject: [PATCH 21/34] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E9=9A=BE=E5=BA=A6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=AD=97=E7=AC=A6=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 4f2541f45..d91a69279 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -105,16 +105,7 @@ const rules = {
   againPassword: [required]
 }
 const reset = () => {
-  passwordConfig.value = {
-    status: true,
-    ruleLevel: "简单",
-    ruleDesc: "1",
-    tryCount: 3,
-    lockHours: 1,
-    updatePeriod: 30,
-    dayTryCount: 3,
-    updateRemind: 7,
-  }
+  getConfig()
 }
 const passwordConfig = ref({
   status: true,

From 39ae50a2e21cee2da46f3765caffdfd23b3fd42c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 08:24:30 +0800
Subject: [PATCH 22/34] =?UTF-8?q?=E5=9B=BD=E5=BC=BA=E8=AE=A9=E6=8A=8A?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=85=88=E6=8B=BF=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/index.vue                | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index b36c4f3c3..6d0455381 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -865,25 +865,26 @@ const handleSelectionPublish = async ()=>{
 
   // 子表新增/编辑校验
   const detailValidate = async (data) => {
-    let tag = false
-    await PurchaseDetailApi.getPurchaseDetailPageCheckData({
-      number: data.poNumber,
-      lineNumber: data.poLine
-    }).then(res => {
-      if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
-        if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
-          message.error(t('ts.要货计划数量不得大于订单数量-已计划数量'))
-          tag = false
-        } else {
-          tag = true
-        }
-      }else{
-        tag = true
-      }
-    }).catch(err =>{
-      console.log(err);
-    })
-    return tag
+    return true
+    // let tag = false
+    // await PurchaseDetailApi.getPurchaseDetailPageCheckData({
+    //   number: data.poNumber,
+    //   lineNumber: data.poLine
+    // }).then(res => {
+    //   if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
+    //     if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
+    //       message.error(t('ts.要货计划数量不得大于订单数量-已计划数量'))
+    //       tag = false
+    //     } else {
+    //       tag = true
+    //     }
+    //   }else{
+    //     tag = true
+    //   }
+    // }).catch(err =>{
+    //   console.log(err);
+    // })
+    // return tag
   }
 
   /** 导入 */

From 5ed4204076dc792693a20948a74620853058ff4a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 08:33:30 +0800
Subject: [PATCH 23/34] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E9=83=BD=E6=98=AFflag=3D1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts                       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 3e0ceb2fc..6f9d5991a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -138,6 +138,11 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
             value: 4,
             isMainValue: false
           },
+          {
+            key: 'flag',
+            value: 1,
+            isMainValue: false
+          },
           {
             key: 'available',
             value: "TRUE",

From 05556e479a66293d56e7b3cf66370c6fe8731701 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 19 Sep 2024 09:46:34 +0800
Subject: [PATCH 24/34] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E9=87=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index d91a69279..2a204081a 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -104,21 +104,24 @@ const rules = {
   password: [required],
   againPassword: [required]
 }
-const reset = () => {
-  getConfig()
-}
-const passwordConfig = ref({
-  status: true,
+const defaultConfig = ref({
+  status: false,
   ruleLevel: "简单",
   ruleDesc: "",
-  tryCount: 3,
+  tryCount: 5,
   lockHours: 1,
-  updatePeriod: 30,
-  dayTryCount: 3,
+  dayTryCount: 5,
+  updatePeriod: 100,
   updateRemind: 7,
 })
+const passwordConfig = ref({})
+const reset = () => {
+  passwordConfig.value = defaultConfig.value
+  changeRule("简单")
+}
 /** 查询配置 */
 const getConfig = async () => {
+  passwordConfig.value = defaultConfig.value
   loading.value = true
   try {
     passwordConfig.value = await api.getConfig()

From 8d0496cd2d0d7afd00ba740296cf433642131449 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Thu, 19 Sep 2024 10:07:22 +0800
Subject: [PATCH 25/34] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E9=87=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=88=9D=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/passwordRule/index.vue | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue
index 2a204081a..353879cba 100644
--- a/src/views/system/passwordRule/index.vue
+++ b/src/views/system/passwordRule/index.vue
@@ -104,24 +104,21 @@ const rules = {
   password: [required],
   againPassword: [required]
 }
-const defaultConfig = ref({
-  status: false,
+const reset = () => {
+  getConfig()
+}
+const passwordConfig = ref({
+  status: true,
   ruleLevel: "简单",
   ruleDesc: "",
-  tryCount: 5,
+  tryCount: 3,
   lockHours: 1,
+  updatePeriod: 180,
   dayTryCount: 5,
-  updatePeriod: 100,
   updateRemind: 7,
 })
-const passwordConfig = ref({})
-const reset = () => {
-  passwordConfig.value = defaultConfig.value
-  changeRule("简单")
-}
 /** 查询配置 */
 const getConfig = async () => {
-  passwordConfig.value = defaultConfig.value
   loading.value = true
   try {
     passwordConfig.value = await api.getConfig()

From 8e3e724a917dda8ae3fba5f16de8953116d68953 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Thu, 19 Sep 2024 10:43:35 +0800
Subject: [PATCH 26/34] HL-6032

---
 .../deliversettlementManage/saleShipmentMainRecord/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index b38c26706..41632cb0e 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -153,7 +153,7 @@ const butttondata = (row, $index) => {
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
-    defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:row.revokeFlag=='TRUE'}), // 撤销
+    defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:(row.revokeFlag=='TRUE'||row.relateRecordNumber != null ) }), // 撤销
   ]
 }
 

From f35a7b9eec42e81a93f40f7eca37001df20c748e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 11:13:55 +0800
Subject: [PATCH 27/34] =?UTF-8?q?HL-6064=E4=B8=9A=E5=8A=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E8=A1=A5=E6=96=99Repleinment=EF=BC=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E5=92=8C=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/upShelfStrategy/AddForm.vue      | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 000036fea..0b06729cc 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1230,7 +1230,39 @@ const submitForm = async () => {
     message.error('请选择库位')
     return
   }
-  
+
+  let TransactionType = formData.value.condition[5]['Value']
+  if(Array.isArray(TransactionType)){
+    TransactionType = TransactionType.join(',')
+  }
+  if(TransactionType=='Repleinment'){
+    //补料--物料和库位必填
+    let msg = ''
+
+    // 判断物料必填
+    let itemCodes = formData.value.condition[1]['Value']
+    if(Array.isArray(itemCodes)){
+      itemCodes = itemCodes.join(',')
+    }
+    if(itemCodes.trim().length<=0){
+      msg  = '请您选择物料'
+    }else if(warehouseType.value!='LocationCode'){
+      // 判断库位必填
+      msg = '请选择库位类型'
+    }else{
+      let locationCodes = formData.value.configuration.LocationCode
+      if(Array.isArray(locationCodes)){
+        locationCodes = locationCodes.join(',')
+      }
+      if(locationCodes.trim().length<=0){
+        msg  = '请您选择库位'
+      }
+    }
+    if(msg){
+      message.error(msg)
+      return
+    }
+  }
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()

From 5d9eee0f3c7ac5f03fd18d66b1b5109f007e3f02 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 11:54:29 +0800
Subject: [PATCH 28/34] =?UTF-8?q?=E4=BC=98=E5=85=88=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/upShelfStrategy/AddForm.vue      | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 0b06729cc..a648a54d9 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1210,6 +1210,37 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
+  let TransactionType = formData.value.condition[5]['Value']
+  if(Array.isArray(TransactionType)){
+    TransactionType = TransactionType.join(',')
+  }
+  if(TransactionType=='Repleinment'){
+    //补料--物料和库位必填
+    let msg = ''
+    let itemCodeType = formData.value.condition[1]['ParamCode']
+    let itemCodes = formData.value.condition[1]['Value']
+    if(Array.isArray(itemCodes)){
+      itemCodes = itemCodes.join(',')
+    }
+    let locationCodes = formData.value.configuration.LocationCode
+    if(Array.isArray(locationCodes)){
+      locationCodes = locationCodes.join(',')
+    }
+    if(itemCodeType!='ItemCode'){
+      msg = '请选择物料'
+    }else if(itemCodes.trim().length<=0){
+      msg  = '请您选择物料'
+    }else if(warehouseType.value!='LocationCode'){
+      // 判断库位必填
+      msg = '请选择库位'
+    }else if(locationCodes.trim().length<=0){
+      msg  = '请您选择库位'
+    }
+    if(msg){
+      message.error(msg)
+      return
+    }
+  }
   await blurWarehouse()
   // await blurTransactionType()
   if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){
@@ -1231,38 +1262,7 @@ const submitForm = async () => {
     return
   }
 
-  let TransactionType = formData.value.condition[5]['Value']
-  if(Array.isArray(TransactionType)){
-    TransactionType = TransactionType.join(',')
-  }
-  if(TransactionType=='Repleinment'){
-    //补料--物料和库位必填
-    let msg = ''
-
-    // 判断物料必填
-    let itemCodes = formData.value.condition[1]['Value']
-    if(Array.isArray(itemCodes)){
-      itemCodes = itemCodes.join(',')
-    }
-    if(itemCodes.trim().length<=0){
-      msg  = '请您选择物料'
-    }else if(warehouseType.value!='LocationCode'){
-      // 判断库位必填
-      msg = '请选择库位类型'
-    }else{
-      let locationCodes = formData.value.configuration.LocationCode
-      if(Array.isArray(locationCodes)){
-        locationCodes = locationCodes.join(',')
-      }
-      if(locationCodes.trim().length<=0){
-        msg  = '请您选择库位'
-      }
-    }
-    if(msg){
-      message.error(msg)
-      return
-    }
-  }
+  
   // 校验表单
   if (!formRef) return
   const valid = await formRef.value.validate()

From 7accf6baf5f1f614103d060888ed7769253203f4 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 12:37:45 +0800
Subject: [PATCH 29/34] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=BC=96=E8=BE=91=EF=BC=8C=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=9A=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?true=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8Cfalse=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=A4=A7=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          |  1 +
 src/locales/zh-CN.ts                          |  1 +
 .../purchasePlanMain/index.vue                | 24 +++++++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 9c6aad57a..e571f3bf9 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -691,6 +691,7 @@ export default {
     预测日期:'Forecast Date',
     订单行:'Order Line',
     计划数量:'Planned Quantity',
+    计划数量必须大于0:'The number of plans must be greater than 0',
     最后更新时间:'Last update time',
     最后更新者:'Last Updater',
     要货计划:'Demand plan',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index b7920e2d5..c5655b206 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -693,6 +693,7 @@ export default {
     预测日期:'预测日期',
     订单行:'订单行',
     计划数量:'计划数量',
+    计划数量必须大于0:'计划数量必须大于0',
     最后更新时间:'最后更新时间',
     最后更新者:'最后更新者',
     要货计划:'要货计划',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 6d0455381..ee6307109 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -83,7 +83,6 @@
     :detailAllSchemas="PurchasePlanDetail.allSchemas"
     :detailAllSchemasRules="PurchasePlanDetailRules"
     :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail"
-    :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail"
     :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage"
     :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
@@ -98,6 +97,8 @@
     :isOpenSearchTable="true"
     :mainSubmitCreateApi="true"
     fieldTableColumn="poLine"
+    @detailOpenForm="detailOpenForm"
+    @handleSubmitForm="handleSubmitForm"
 
   />
   <!-- 导入 -->
@@ -517,7 +518,26 @@ const getSearchTableData = async (number,formField,searchField)=>{
     const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
     if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
   }
-
+  const detailOpenForm = (type, row) => {
+    
+    PurchasePlanDetail.allSchemas.formSchema.forEach(item=>{
+      if(item.field == 'planQty'){
+        //计划数量
+        item.componentProps.disabled = row.available=="FALSE"
+      }
+    })
+  }
+  const handleSubmitForm = async (formType, data)=>{
+    if(formType == 'update'){
+      if(Number(data.planQty)<=0){
+        message.error(t('ts.计划数量必须大于0'))
+        return
+      }
+      await PurchasePlanDetailApi.updatePurchasePlanDetail(data)
+      message.success(t('common.updateSuccess'))
+    }
+    
+  }
   /** 删除按钮操作 */
   const handleDelete = async (id : number) => {
     try {

From 8b73e40cca6d7da99801c7a2887c53752ddd6e3d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 14:01:13 +0800
Subject: [PATCH 30/34] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=98=8E=E7=BB=86=E7=BC=96=E8=BE=91=E5=AE=8C?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=9C=AA=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchasePlanMain/index.vue              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index ee6307109..bf4d22be7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -98,7 +98,7 @@
     :mainSubmitCreateApi="true"
     fieldTableColumn="poLine"
     @detailOpenForm="detailOpenForm"
-    @handleSubmitForm="handleSubmitForm"
+    @handleSubmitForm="handleDetailSubmitForm"
 
   />
   <!-- 导入 -->
@@ -527,7 +527,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       }
     })
   }
-  const handleSubmitForm = async (formType, data)=>{
+  const handleDetailSubmitForm = async (formType, data)=>{
     if(formType == 'update'){
       if(Number(data.planQty)<=0){
         message.error(t('ts.计划数量必须大于0'))
@@ -536,7 +536,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       await PurchasePlanDetailApi.updatePurchasePlanDetail(data)
       message.success(t('common.updateSuccess'))
     }
-    
+    detailRef.value.submitUpdateList()
   }
   /** 删除按钮操作 */
   const handleDelete = async (id : number) => {

From 4e6556cb6278e559d4a5d8ab76aa93ed4e082340 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 19 Sep 2024 14:08:15 +0800
Subject: [PATCH 31/34] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=89=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain.data.ts        | 341 +++++++++++++++++-
 1 file changed, 340 insertions(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 01e14deae..026650dba 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -9,7 +9,6 @@ import * as ProductionlineApi from '@/api/wms/productionline'
 import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 
 import * as WorkstationApi from '@/api/wms/workstation'
-import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
 
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
@@ -35,6 +34,10 @@ import * as QadProjectApi from '@/api/wms/qadProject'
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as confgiApi  from '@/api/infra/config'
+
 // import * as LocationApi from '@/api/wms/location'
 // import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
@@ -56,6 +59,342 @@ const userDept = userStore.userSelfInfo.dept
 userDept.id = userDept.id.toString()
 const userDeptArray: any = [userDept]
 
+const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
+const confgiDataTwo = await confgiApi.queryByKey("WorkStation-OUT")
+
+
+/**
+ * @returns {Array} 工位
+ */
+export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '原料库位',
+    field: 'rawLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: confgiDataOne.areaType,
+          isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '成品库位',
+    field: 'fgLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },
+        {
+          key: 'areaType',
+          value: confgiDataTwo.areaType,
+          isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  // {
+  //   label: '类型',
+  //   field: 'type',
+  //   dictType: DICT_TYPE.WORK_STATION_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '车间代码',
+    field: 'workshopCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择车间代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'workshopCode',
+          value:'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+
 /**
  * @returns {Array} 生产退料申请主表
  */

From 8ca888160b9818a6b20b5d36efad06f2a94c7290 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 14:14:53 +0800
Subject: [PATCH 32/34] =?UTF-8?q?HL-5786=E7=BA=BF=E8=BE=B9=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrap/productionscrapRequestMain/index.vue      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 165a6c03e..67f81a140 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -258,6 +258,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
     } else {
       const setV = {}
+      if(formField == 'workshopCode'){
+        setV['productionLineCode'] = ''
+        tableData.value = []
+      }
       if(formField == 'costCenterCode'){
         setV['costcentreCode'] = val[0]['costcentreCode']
         setV['costCenterType'] = val[0]['costcentreType']

From e283ac639b51e87a2824b343edd5c534a9c7a05c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 15:43:10 +0800
Subject: [PATCH 33/34] =?UTF-8?q?HL-5786@=E7=8E=8B=E5=AE=87=E9=A3=9E=20=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=B8=8D=E8=AE=A9?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain/index.vue           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 67f81a140..36fd39b4f 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -560,6 +560,13 @@ const openForm =async (type: string, row?: number) => {
   if (type == 'update') {
     // 修改 tableform 属性
     ProductionscrapRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'productionLineCode') {
+        //生产线不让编辑
+        itemColumns.componentProps.disabled = true
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.enterSearch = false
+
+      }
       if(itemColumns.field == 'workshopCode') {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
@@ -568,6 +575,13 @@ const openForm =async (type: string, row?: number) => {
   } else {
     // 修改 tableform 属性
     ProductionscrapRequestMain.allSchemas.formSchema.map(itemColumns => {
+      if(itemColumns.field == 'productionLineCode') {
+        //生产线不让编辑
+        itemColumns.componentProps.disabled = false
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.enterSearch = true
+
+      }
       if(itemColumns.field == 'workshopCode') {
         itemColumns.componentProps.isSearchList = true
         itemColumns.componentProps.disabled = false

From 7e959db1c93ea71eeaca2aa2cab293699e15b99d Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Thu, 19 Sep 2024 16:54:48 +0800
Subject: [PATCH 34/34] =?UTF-8?q?HL-57862.=E9=80=89=E6=8B=A9=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E3=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=90=8E=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=BA=94=E4=B9=9F=E6=B8=85=E7=A9=BA=EF=BC=8C=E7=8E=B0=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=B2=A1=E6=9C=89=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionscrapRequestMain/index.vue           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 36fd39b4f..40ca3e79f 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -60,6 +60,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @inputNumberChange="inputNumberChange"
+    @clearSearchInput="clearSearchInput"
   />
 
   <!-- 详情 -->
@@ -202,6 +203,19 @@ const inputNumberChange = (field, index, row, val) => {
     row.amount = Number(Number(row.qty * row.singlePrice).toFixed(2))
   }
 }
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('workshopCode'==field){
+    //车间
+    formRef.value.formRef.setValues({
+      productionLineCode: ''
+    })
+    tableData.value = []
+  }else if('productionLineCode'==field){
+    //生产线
+    tableData.value = []
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async () => {