From 7c4fcb16fda385c7b2b831049849dca2be19c557 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 21 Aug 2024 11:51:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?HL-5466=E6=8A=A5=E5=BA=9F=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + .../productscrapRecordMain.data.ts | 12 ++++++++++++ .../productscrapRequestMain.data.ts | 15 +++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 11aca3804..7f6ceb033 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -401,4 +401,5 @@ export enum DICT_TYPE { PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态 PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态 RETURN_REASON_TYPE = 'return_reason_type', // 采购退货原因类型 + SCRAPPING_REASON = 'scrapping_reason', //制品子件报废原因 } diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 16a0a352d..551eca89d 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -116,6 +116,18 @@ export const ProductscrapRecordMain = useCrudSchemas( width: 150 } }, + { + label: '报废原因', + field: 'scrappingReason', + dictType: DICT_TYPE.SCRAPPING_REASON, + dictClass: 'string', + isForm: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '任务单号', field: 'jobNumber', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 881153b74..d88934572 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -310,6 +310,18 @@ export const ProductscrapRequestMain = useCrudSchemas( } } }, + { + label: '报废原因', + field: 'scrappingReason', + dictType: DICT_TYPE.SCRAPPING_REASON, + dictClass: 'string', + isForm: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -644,6 +656,9 @@ export const ProductscrapRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + scrappingReason: [ + { required: true, message: '请输入报废原因', trigger: 'blur' } + ], }) /** From 33dd2ef702186a23721f06f683631d153d50ecbb Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 21 Aug 2024 11:59:44 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRequest/index.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue index 4e6ea8443..b863a1a02 100644 --- a/src/views/qms/inspectionRequest/index.vue +++ b/src/views/qms/inspectionRequest/index.vue @@ -5,9 +5,7 @@ @@ -510,7 +508,7 @@ const ListTableSubmit = async (formType, data) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await InspectionMainApi.importTemplate() From 7f4604928e3c0a302421c4666c6c5177340a8136 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 21 Aug 2024 12:00:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5531=20=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E5=90=8E=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 6 ++++++ src/views/wms/inventoryManage/package/index.vue | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 64a9fbf06..8854a8b3d 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -101,6 +101,12 @@ export const batchPrintingLable = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLable`, data }) } + +// 批量打印标签多选 +export const batchPrintingLables = async (data: any) => { + return await request.post({ url: `/wms/package/batchPrintingLables`, data }) +} + // 打印标签获取包装列表 export const getLabel = async (id: number) => { return await request.get({ url: `/wms/package/getLabel?id=` + id }) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index aee66956f..405d9989c 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -359,7 +359,7 @@ const formsSuccess = async (formType,data) => { const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { console.log(row.packingNumber,445555555555555); - PackageApi.batchPrintingLable([row.number]).then(res => { + PackageApi.batchPrintingLables([row.number]).then(res => { console.log('批量打印res',res); if(res.zzLabel){ //制造标签 From 481e8d2f29d6bdfcfbdcff794f7b046878c80a18 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 13:16:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?HL-5281=E4=B8=8B=E6=9E=B6=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=A4=9A=E9=80=89=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=A1=AB=E5=86=99=EF=BC=8C=E5=90=A6=E5=88=99?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E8=AF=81=E5=A1=AB=E5=86=99=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=AF=E6=AD=A3=E7=A1=AE=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/downShelfStrategy/AddForm.vue | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index ed8ffd727..d9fb3656a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -305,12 +305,19 @@ :key="'库存事务Operator'+cur.value" /> - + /> --> + + + @@ -639,6 +646,11 @@ import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import * as TransactiontypeApi from '@/api/wms/transactiontype' +import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data' + + + const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -904,8 +916,22 @@ const filterMethodWarehouseList = (query: string) => { const searchTableRef = ref() -const searchWarehouse = ()=>{ +//事务类型 +const searchTransactionType = ()=>{ + searchTableRef.value.open( + '请选择事务类型', + Transactiontype.allSchemas, + TransactiontypeApi.getTransactiontypePage, + 'TransactionType', + 'code', + true, + undefined, + undefined, + undefined + ) +} +const searchWarehouse = ()=>{ if(warehouseType.value == 'WarehouseCode'){ // 仓库 @@ -964,6 +990,13 @@ const searchWarehouse = ()=>{ } const searchTableSuccess = (formField, searchField, val, type, row) => { + if(formField=='TransactionType'){ + let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType') + if(transactionType){ + transactionType.Value = val.map(item=>(item['code'])).join(',') + } + return + } // let searchTableTitle = warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':'' console.log('searchTableSuccess',formField, searchField, val, type, row) console.log(val.map(item=>(item['code'])).join(',')) From d9be31dde916093fb23132da943bd06016d1dfad Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 21 Aug 2024 13:30:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5418=20?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 405d9989c..6746eb1e1 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -193,7 +193,7 @@ const handleSelectionPoint = async ()=>{ text: 'loading...', background: 'rgba(0, 0, 0, 0.7)' }) - PackageApi.batchPrintingLable(rows).then(res => { + PackageApi.batchPrintingLables(rows).then(res => { console.log('批量打印res',res); getLoading?.close() if(res.zzLabel){