From 27433c9f0add7a9ea2e5de61fe4e077d31123bfd Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 15:40:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=20=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 47f9ad915..453320ce8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -830,6 +830,10 @@ const submitForm = async (formType, data) => { message.warning("退货数量不能大于收获数量") return; } + if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.inventoryBalance))){ + message.warning("退货数量不能大于库存余额") + return; + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { From b83c7832929587541121d99a20e16862d1ceb657 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 15:52:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 453320ce8..28800293d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -826,11 +826,12 @@ const tableSelectionDelete = (selection) => { // 主子数据 提交 const submitForm = async (formType, data) => { - if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){ - message.warning("退货数量不能大于收获数量") - return; - } - if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.inventoryBalance))){ + console.log('submitForm',tableData.value) + // if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){ + // message.warning("退货数量不能大于收获数量") + // return; + // } + if(tableData.value.find(item=>Number(item.qty)>Number(item.inventoryBalance))){ message.warning("退货数量不能大于库存余额") return; } From c603f8b97fb89ea60a34077891ce387ab8a52ed0 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 30 May 2024 16:00:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AD=90=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 28800293d..f364551b9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -210,7 +210,7 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row const searchTableSuccess = async(formField, searchField, val, formRef, type, row) => { console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) - + console.log('searchTableSuccess123',val) nextTick( async () => { if (type == 'tableForm') { @@ -263,7 +263,7 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row let params = { itemCode: row.itemCode, batch: row.batch, - locationCode:val.code + locationCode:val[0]['code'] } let aa = await BalanceApi.getSumByConditions(params); console.log('23423423',aa); From 6f89369e01ff7aeed5d179c957e7030bb50332c0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 30 May 2024 16:05:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E5=90=8E?= =?UTF-8?q?=E5=85=AD=E4=BD=8D=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspectionRecord/inspectionRecordMain.data.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts index 01de70af0..90263f8d8 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts @@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter2 } from '@/utils/formatTime' import { validateHanset, validateEmail } from '@/utils/validator' import { dateFormatter } from '@/utils/formatTime' -import {validateTwoNum } from '@/utils/validator' +import {validateTwoNum,validateSixNum } from '@/utils/validator' const { t } = useI18n() // 国际化 /** @@ -716,18 +716,18 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ export const InspectionRecordPackageRules = reactive({ qualifiedAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], frozenAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], destroyAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], noQualifiedAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], }) From aba9b3ca5dffc95a3ff30a28bf5b1ac032968f2f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 30 May 2024 16:18:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierdeliverRequestMain/index.ts | 6 +++++ src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + .../supplierdeliverRequestMain/index.vue | 26 +++++++++++++++---- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index dddc0c3a1..b85ae51c6 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -96,6 +96,12 @@ export const genLabel = async (data:SupplierdeliverRequestMainVO) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel`,data }) } +// 校验是否修改了包装数量 +export const checkPackQty = async (data:SupplierdeliverRequestMainVO) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/checkPackQty`,data }) +} + + // 生成记录 export const genRecordsSupplierdeliverRequestMain = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id }) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 8716cb4cf..a1b887cfa 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -774,6 +774,7 @@ export default { 物品包装信息:'Item packaging information', 系统提示:'System Prompt', 是否为此数据生成标签:'Do you generate labels for this data?', + 是否修改物料包装标包数量:'Do you want to modify the quantity of material packaging?', 是否处理所选中数据:'Do you process the selected data?', 发货:'shipments', 标签信息:'Label information', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index ea7b03a7d..285b29a13 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -774,6 +774,7 @@ export default { 物品包装信息:'物品包装信息', 系统提示:'系统提示', 是否为此数据生成标签:'是否为此数据生成标签', + 是否修改物料包装标包数量:'是否修改物料包装标包数量', 是否处理所选中数据:'是否处理所选中数据', 发货:'发货', 标签信息:'标签信息', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index feda09164..58ebb27b9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -788,11 +788,27 @@ const submitFormLabel = async (formType, data) => { console.log("formType==",formType) console.log("data==",data) data.subList = detatableData.tableList - console.log("detatableData",detatableData) - await message.confirm(t('ts.是否为此数据生成标签？')) - await SupplierdeliverRequestMainApi.genLabel(data) - isCreateLabel.value = true - message.success(t('ts.创建标签成功')) + // 校验物料包装规格数量是否修改 + let flag = false; + await SupplierdeliverRequestMainApi.checkPackQty(data).then(async res => { + if(res){ + await message.confirm(t('ts.是否修改物料包装标包数量')+'?').then(()=>{ + flag = true; //修改标包数量 + }).catch(() =>{ + flag = false + }) + }else{ + flag = true; //修改标包数量 + } + }) + console.log("返回结果",flag); + if(flag){ + console.log("detatableData",detatableData) + await message.confirm(t('ts.是否为此数据生成标签？')) + await SupplierdeliverRequestMainApi.genLabel(data) + isCreateLabel.value = true + message.success(t('ts.创建标签成功')) + } getList() } finally { formLabelRef.value.formLoading = false From ddd761f74df474fa37d78f600ea4eac3506da4a7 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 30 May 2024 16:41:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 502d4cfe0..c6ca17db8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1013,7 +1013,10 @@ export const UnplannedreceiptRequestDetailRules = reactive({ ], qadProjectCode:[ { required: true, message: '请选择科目代码', trigger: 'change' } - ] + ], + singlePrice:[ + { required: true, message: '请维护标准成本价格', trigger: 'blur' } + ], })