From c0185a3ce7b4e156567847c96b22f40e6b9b89ee Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 28 Mar 2025 10:03:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?YT-2288=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=97?= =?UTF-8?q?=E5=85=A5=E5=8F=B7=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/modelDeliTime/index.vue | 14 +++++++----- .../modelDeliTime/modelDeliTime.data.ts | 22 +++++++++---------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue index 25ac3a5db..a67edd609 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue @@ -148,8 +148,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => } const setV = {} setV[formField] = val[0][searchField] - if (formField == 'modelShow') { - setV['modelShow'] = val.map(item=>item.model).join(',') + if (formField == 'model') { + setV['model'] = val.map(item=>item.model).join(',') } if (formField == 'supplierCode') { @@ -182,7 +182,7 @@ const submitForm = async (formType, submitData) => { if (data.masterId) { data.id = data.masterId } - data.model =data.modelShow[0] + // data.model =data.modelShow[0] // data.model =data.modelShow.join(',') data.yearAndMonth =data.yearAndMonthShow.join(',') data.subList = tableData.value // 拼接子表数据参数 @@ -327,23 +327,25 @@ const openForm = async (type: string, row?: any) => { item.componentProps.isSearchList = false item.componentProps.disabled = true } - if (item.field == 'modelShow') { + if (item.field == 'model') { item.componentProps.disabled = true + item.componentProps.isSearchList = false } if (item.field == 'yearAndMonthShow') { item.componentProps.disabled = true } }) row.yearAndMonthShow =row.yearAndMonth.split(',') - row.modelShow =row.model.split(',') + // row.modelShow =row.model.split(',') } else { ModelDeliTime.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { item.componentProps.isSearchList = true item.componentProps.disabled = false } - if (item.field == 'modelShow') { + if (item.field == 'model') { item.componentProps.disabled = false + item.componentProps.isSearchList = true } if (item.field == 'yearAndMonthShow') { item.componentProps.disabled = false diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts index 5a742fd1f..b796c0be4 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts @@ -106,11 +106,11 @@ export const ModelDeliTime = useCrudSchemas(reactive([ // }, { label: '受入号', - field: 'modelShow', + field: 'model', sort: 'custom', isSearch: true, - isTable: false, - isDetail: false, + isTable: true, + isDetail: true, // form: { // component: 'Select', // componentProps: { @@ -156,14 +156,14 @@ export const ModelDeliTime = useCrudSchemas(reactive([ } } }, - { - label: '受入号', - field: 'model', - sort: 'custom', - isTable: true, - isDetail: true, - isForm: false, - }, + // { + // label: '受入号', + // field: 'model', + // sort: 'custom', + // isTable: true, + // isDetail: true, + // isForm: false, + // }, { label: '年月', field: 'yearAndMonthShow', From 73c6e319d2b8c8858912a3c3e49a801c6dfca6d0 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 28 Mar 2025 11:33:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8E=BB=E6=8E=89=E5=8F=91=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index e5c5e95b3..ffe41d404 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -482,7 +482,8 @@ const isShowMainButton1 = (row, val) => { { label: t('ts.创建发货申请'), name: 'supplierdeliver', - hide: isShowMainButton(row, ['4']) || !row.isShowCreateRequestButton, + // hide: isShowMainButton(row, ['4']) || !row.isShowCreateRequestButton, + hide: isShowMainButton(row, ['4']), type: 'primary', icon: '', color: '', From 35a3f406892a8bebc4484090168438e8df24fc5e Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 28 Mar 2025 12:17:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index ffe41d404..e5c5e95b3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -482,8 +482,7 @@ const isShowMainButton1 = (row, val) => { { label: t('ts.创建发货申请'), name: 'supplierdeliver', - // hide: isShowMainButton(row, ['4']) || !row.isShowCreateRequestButton, - hide: isShowMainButton(row, ['4']), + hide: isShowMainButton(row, ['4']) || !row.isShowCreateRequestButton, type: 'primary', icon: '', color: '', From c2832945777a3c3be38ddf98db61ad150c862d0b Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 28 Mar 2025 14:50:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?YT-2006=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/Table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 43881054e..b45b2c470 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -352,7 +352,7 @@ export default defineComponent({ } } //默认排序 - updateSort(columns) + // updateSort(columns) return [...[renderTableExpand()], ...[renderTableSelection()]].concat( (columnsChildren || columns).map((v) => { const zhName = v.label || '';//中文名称 From 42695fcf614452e3edceb22efe24ec64a17aad5a Mon Sep 17 00:00:00 2001 From: zhang_li Date: Fri, 28 Mar 2025 15:27:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=81=A2=E5=A4=8DYT-2006=E5=8F=B7=E5=8F=A3?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=94=B3=E8=AF=B7=E5=92=8C=E5=8F=B7=E5=8F=A3?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E5=A5=BD=E4=BD=BF=EF=BC=8C=E4=B8=8D=E5=9C=A8=E6=AD=A4=E5=88=86?= =?UTF-8?q?=E6=94=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9C=A8=E4=B8=BB=E5=88=86?= =?UTF-8?q?=E6=94=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/src/Table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index b45b2c470..43881054e 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -352,7 +352,7 @@ export default defineComponent({ } } //默认排序 - // updateSort(columns) + updateSort(columns) return [...[renderTableExpand()], ...[renderTableSelection()]].concat( (columnsChildren || columns).map((v) => { const zhName = v.label || '';//中文名称 From 8f9c16120e210e9f26b928025931151b0be2d2e0 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sat, 29 Mar 2025 11:09:36 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8F=91=E8=B4=A7=EF=BC=9A=E8=B6=85=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E4=B8=BA0=20=E8=AE=A9=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=89=8B=E5=8A=A8=E5=A1=AB=E5=86=99=20?= =?UTF-8?q?=E4=B8=8D=E8=B6=85=E5=8F=91=E7=9A=84=E9=BB=98=E8=AE=A4=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F,=E7=82=B9=E5=87=BB=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E6=97=B6=E5=80=99=E6=98=8E=E7=BB=86=E6=89=80?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=95=B0=E6=8D=AE=E9=83=BD=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=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 + .../supplierdeliverBasicForm.vue | 30 ++++++++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 90e330482..4c195e17d 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1325,6 +1325,7 @@ export default { 退回:'Return', 作废成功: 'Invalid successfully', '索赔金额不能为0，请修改后提交。': 'The claim amount cannot be 0, please modify and submit.', + '发货数量必须大于0': 'The shipment quantity must be greater than 0', 新增班次: 'Create Shift', 更多:'More', 批量重试:'Batch retry', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 50ebd2930..4fa544df5 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1324,6 +1324,7 @@ export default { 作废成功:'作废成功', 退回: '退回', '索赔金额不能为0，请修改后提交。': '索赔金额不能为0，请修改后提交。', + '发货数量必须大于0': '发货数量必须大于0', 新增班次:'新增班次', 更多:'更多', 批量重试:'批量重试', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index fe656f047..ed0656863 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -312,8 +312,11 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{ let produceDateStr = formatDate(newRow['produceDate'],'YYYYMMDD'); newRow['batch'] = produceDateStr newRow['supplierBatch'] = produceDateStr - newRow.expireDate = row['expireTime']?addDay(newRow['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() - + newRow.expireDate = row['expireTime'] ? addDay(newRow['produceDate'], row['expireTime']).valueOf() : dayjs('2099-12-31').valueOf() + // 可以允许超发 + if (newRow['allowOverShipment'] == 'TRUE') { + newRow['qty'] =0 + } tableData.value.push(newRow) itemCodes.push(row['itemCode']) }) @@ -356,9 +359,9 @@ const submitForm = async (formType, submitData) => { // data.subList = tableData.value // 拼接子表数据参数 data.subList = [] for (let item of tableData.value) { - if(item.qty>0){ + // if(item.qty>0){ data.subList.push(item) // 拼接子表数据参数 - } + // } } let isHave = data.subList.some((item) => { @@ -374,6 +377,9 @@ const submitForm = async (formType, submitData) => { // 2.2. 如果物料不允许超发，申请发货数量不能大于 计划数量 - 已发货数量 let itemCodes = [] let itemCodeSum = [] + // 2.3 如果物料发货是0，不可以提交 + let itemCodesQtyIsZ = [] + console.log(222, data.subList) data.subList.forEach(item=>{ if(item['allowOverShipment']!='TRUE'){ let qtyDefault = item['planQty'] - item['shippedQty'] @@ -395,7 +401,23 @@ const submitForm = async (formType, submitData) => { } } } + console.log(item['qty']) + if(!item['qty']||item['qty']==0){ + itemCodesQtyIsZ.push({ + itemCode:item['itemCode'], + poLine:item['poLine'] + }) + } }) + if(itemCodesQtyIsZ.length>0){ + let str = '' + itemCodesQtyIsZ.forEach(cur => { + str += `【物料号${cur.itemCode}-订单行${cur.poLine}】` + }) + message.error(`${str}${t('ts.发货数量必须大于0')}`) + return + } + return if(itemCodes.length>0){ let str = '' itemCodes.forEach(cur => { From 41b08d354ee4b186964d6ab82b95efd10a082f70 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Sat, 29 Mar 2025 11:10:14 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/supplierdeliverBasicForm.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index ed0656863..9aba3b5e3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -417,7 +417,6 @@ const submitForm = async (formType, submitData) => { message.error(`${str}${t('ts.发货数量必须大于0')}`) return } - return if(itemCodes.length>0){ let str = '' itemCodes.forEach(cur => {