From 9784f5332854ebfc7b9d3022e5b5b944a9ced23e Mon Sep 17 00:00:00 2001 From: guoshuang Date: Tue, 23 Apr 2024 17:29:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=90=E5=93=81=E7=9B=98=E7=82=B9&&?= =?UTF-8?q?=E6=88=90=E5=93=81=E6=89=B9=E9=87=8F=E4=B8=8B=E7=BA=BF=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 16 + .../FGmanagement/FinishedProCheck/index.vue | 727 +++++++++++++++++ .../FGmanagement/FinishedProCheck/model.ts | 94 +++ .../wms/product/BatchOfflineStorage/index.vue | 763 ++++++++++++++++++ .../wms/product/BatchOfflineStorage/model.ts | 71 ++ src/pages/wms/product/SaleOutWH/index.vue | 27 + src/pages/wms/product/SaleOutWH/model.ts | 7 + src/utils/page.ts | 2 + src/utils/url.ts | 10 + 9 files changed, 1717 insertions(+) create mode 100644 src/pages/wms/FGmanagement/FinishedProCheck/index.vue create mode 100644 src/pages/wms/FGmanagement/FinishedProCheck/model.ts create mode 100644 src/pages/wms/product/BatchOfflineStorage/index.vue create mode 100644 src/pages/wms/product/BatchOfflineStorage/model.ts diff --git a/src/pages.json b/src/pages.json index 8711d8b..7381186 100644 --- a/src/pages.json +++ b/src/pages.json @@ -519,6 +519,22 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/FGmanagement/FinishedProCheck/index", + "style": { + "navigationBarTitleText": "成品盘点", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/wms/product/BatchOfflineStorage/index", + "style": { + "navigationBarTitleText": "批量下线入库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/wms/FGmanagement/FinishedProCheck/index.vue b/src/pages/wms/FGmanagement/FinishedProCheck/index.vue new file mode 100644 index 0000000..94a723d --- /dev/null +++ b/src/pages/wms/FGmanagement/FinishedProCheck/index.vue @@ -0,0 +1,727 @@ + + + diff --git a/src/pages/wms/FGmanagement/FinishedProCheck/model.ts b/src/pages/wms/FGmanagement/FinishedProCheck/model.ts new file mode 100644 index 0000000..9393924 --- /dev/null +++ b/src/pages/wms/FGmanagement/FinishedProCheck/model.ts @@ -0,0 +1,94 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.FGmanagement.FinishedProCheck', +}) +export class FinishedProCheck extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async showProduceCode(orderNo: any) { + const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.selectOdsProductEmbryoInventory, { + orderCode: orderNo, + siteCode: session.FactoryCode, + }); + // http.defaults.headers.common['Accept-Language'] = session.PoolName; + const orderNoItemList = result.data; + return { orderNoItemList }; + } + information: any = []; + @MutationAction + async queryinformation(item) { + console.log(item); + const result: any = await http.get(url.lanjuwms.product.SaleOutWH.queryinformation + '/' + item.orderNo + '/' + item.value, {}); + const information = result.data; + return { information }; + } + TraysList: any = []; + @MutationAction + async showTrays(item: any) { + const result: any = await http.get(url.lanjuwms.product.SaleOutWH.showTrays + '/' + item.orderNo + '/' + item.value, {}); + const TraysList = result.data; + return { TraysList }; + } + SubmitCode: any = ''; + scanreturndata: any = {}; + @MutationAction + async selloutconntray(params: any) { + const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.selectScanningTray, params); + let scanreturndata: any; + if (result.data) { + scanreturndata = result.data; + } else { + scanreturndata = null; + } + + const SubmitCode = result.code; + return { scanreturndata, SubmitCode }; + } + confirmcode: any = ''; + @MutationAction + async confirmscan(params: any) { + const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.confirmInventory, params); + const confirmcode = result.code; + return { confirmcode }; + } + //查询盘点数据接口 + seleconfirmcode: any = ''; + selectscandataobj: any = []; + @MutationAction + async selectscandata(params: string) { + const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.selectOdsProductEmbryoInventoryCorrelation, { + orderCode: params, + siteCode: session.FactoryCode, + }); + console.log('e32dwedc', result); + const seleconfirmcode = result.code; + const selectscandataobj = result.data; + + return { seleconfirmcode, selectscandataobj }; + } + @MutationAction + async deleteTray(item: string) { + console.log(item); + const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.cancelInventory, { + siteCode: session.FactoryCode, + id: item, + }); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async check(params: any) { + const result: any = await http.post(url.lanjuwms.FGmanagement.FinishedProCheck.confirmCompletion, params); + const SubmitCode = result.code; + return { SubmitCode }; + } +} + +export default getModule(FinishedProCheck); diff --git a/src/pages/wms/product/BatchOfflineStorage/index.vue b/src/pages/wms/product/BatchOfflineStorage/index.vue new file mode 100644 index 0000000..4c6abf0 --- /dev/null +++ b/src/pages/wms/product/BatchOfflineStorage/index.vue @@ -0,0 +1,763 @@ + + + diff --git a/src/pages/wms/product/BatchOfflineStorage/model.ts b/src/pages/wms/product/BatchOfflineStorage/model.ts new file mode 100644 index 0000000..e14f03c --- /dev/null +++ b/src/pages/wms/product/BatchOfflineStorage/model.ts @@ -0,0 +1,71 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.product.BatchOfflineStorage', +}) +// http.defaults.headers.common['poolName'] = session.PoolName; +export class BatchOfflineStorage extends VuexModule { + WlList = []; + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.post(url.lanjuwms.product.OfflineStorage.queryinformation, { + workOrder: orderNo, + factoryCode: session.FactoryCode, + // headers: { + // poolName: session.PoolName, + // }, + }); + // http.defaults.headers.common['Accept-Language'] = session.PoolName; + const orderNoItemList = result.data; + return { orderNoItemList }; + } + productCodeList: any = []; + @MutationAction + async list(orderNo: any) { + const result: any = await http.get(url.lanjuwms.product.OfflineStorage.list + '/' + orderNo, {}); + const productCodeList = result.data; + return { productCodeList }; + } + SubmitCode: any = ''; + @MutationAction + async insertTary(params: any) { + const result: any = await http.post(url.lanjuwms.product.OfflineStorage.insertTary, params); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async deleteTray(item: any) { + console.log(item); + const result: any = await http.delete(url.lanjuwms.product.OfflineStorage.deleteTray + '/' + item.sn + '/' + item.orderNo); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async handPut(params: any) { + const result: any = await http.post(url.lanjuwms.product.OfflineStorage.WmsProductPutByWorkOrderConfirm, params); + const SubmitCode = result.code; + return { SubmitCode }; + } + warehouselist: any = []; + @MutationAction + async getwarehouselist() { + const result = await http.post(url.lanjuwms.raw.ProductionREQ.warehouselist, { + factoryCode: session.FactoryCode, + }); + const warehouselist = result.data.map((element: any) => ({ + label: element.warehouseName, + value: element.warehouseCode, + ...element, + })); + return { warehouselist }; + } +} + +export default getModule(BatchOfflineStorage); diff --git a/src/pages/wms/product/SaleOutWH/index.vue b/src/pages/wms/product/SaleOutWH/index.vue index bf91808..e416eec 100644 --- a/src/pages/wms/product/SaleOutWH/index.vue +++ b/src/pages/wms/product/SaleOutWH/index.vue @@ -369,6 +369,33 @@ export default class SaleOutWH extends BasePage { } async tidan() { //提单方法 + // if (this.orderNo == '' || this.orderNo.length == 0) { + // (this.$refs.uToast as any).show({ + // title: '请输入备货单号', + // // url: '/pages/user/index' + // }); + // return; + // } + let item = { + factoryCode: session.FactoryCode, + //deliveryOrder: this.orderNo, + createBy: session.loginName, + }; + await this.model.selectFinishedProductSales(item); + if (this.model.tidancode == '200') { + (this.$refs.uToast as any).show({ + title: '提单成功', + type: 'success', + }); + //this.list = []; + this.query(); + //this.productCodebiaozhiwei = ''; + } else { + (this.$refs.uToast as any).show({ + title: '提单失败', + type: 'error', + }); + } } } diff --git a/src/pages/wms/product/SaleOutWH/model.ts b/src/pages/wms/product/SaleOutWH/model.ts index d614552..fbde8ed 100644 --- a/src/pages/wms/product/SaleOutWH/model.ts +++ b/src/pages/wms/product/SaleOutWH/model.ts @@ -66,6 +66,13 @@ export class SaleOutWH extends VuexModule { })); return { warehouselist }; } + tidancode: any = ''; + @MutationAction + async selectFinishedProductSales(params) { + const result: any = await http.post(url.lanjuwms.product.SaleOutWH.selectFinishedProductSales, params); + const tidancode = result.code; + return { tidancode }; + } } export default getModule(SaleOutWH); diff --git a/src/utils/page.ts b/src/utils/page.ts index 423921e..5819504 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -43,5 +43,7 @@ export const page = { SalesReturndetail: '/pages/wms/product/SalesReturn/detail', TransferWarehouse: '/pages/wms/product/TransferWarehouse/index', PalletShift: '/pages/wms/FGmanagement/PalletShift/index', + FinishedProCheck: '/pages/wms/FGmanagement/FinishedProCheck/index', + BatchOfflineStorage: '/pages/wms/product/BatchOfflineStorage/index', }, }; diff --git a/src/utils/url.ts b/src/utils/url.ts index 1aa7dc3..dc841af 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -73,6 +73,8 @@ export const url = { selectQueryFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/selectQueryFinishedProductSales', //销售出库确认 confirmFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/confirmFinishedProductSales', + //提单接口 + selectFinishedProductSales: qianzhuione + '/wms/WmsToWCSmission/selectFinishedProductSales', }, SalesReturn: { FinishedProductSalesReturn: qianzhuione + '/wms/WmsToWCSmission/FinishedProductSalesReturn', @@ -144,6 +146,14 @@ export const url = { palletScanning: qianzhuione + '/wms/WmsToWCSmission/palletScanning', palletTransferConfirmation: qianzhuione + '/wms/WmsToWCSmission/palletTransferConfirmation', }, + FinishedProCheck: { + selectOdsProductEmbryoInventory: qianzhuione + '/wms/WmsToWCSmission/selectOdsProductEmbryoInventory', + selectScanningTray: qianzhuione + '/wms/WmsToWCSmission/selectScanningTray', + confirmInventory: qianzhuione + '/wms/WmsToWCSmission/confirmInventory', + cancelInventory: qianzhuione + '/wms/WmsToWCSmission/cancelInventory', + selectOdsProductEmbryoInventoryCorrelation: qianzhuione + '/wms/WmsToWCSmission/selectOdsProductEmbryoInventoryCorrelation', + confirmCompletion: qianzhuione + '/wms/WmsToWCSmission/confirmCompletion', + }, }, }, // 设备管理 From d50970114a9e61dcb5dc9b2d487133a4030e9268 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 24 Apr 2024 09:29:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wms/FGmanagement/FinishedProCheck/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/wms/FGmanagement/FinishedProCheck/index.vue b/src/pages/wms/FGmanagement/FinishedProCheck/index.vue index 94a723d..4573c27 100644 --- a/src/pages/wms/FGmanagement/FinishedProCheck/index.vue +++ b/src/pages/wms/FGmanagement/FinishedProCheck/index.vue @@ -351,7 +351,7 @@ export default class FinishedProCheck extends BasePage { }); this.list = []; this.orderNo = ''; - this.aimWl = {}; + this.aimWl = {} as OptionType; this.orderNoItemList = {}; this.materilist = []; //this.query(); From fdce9c077542748e62f233cc628b977c1bb2e62d Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 24 Apr 2024 09:38:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?wms=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/wms/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/wms/index.vue b/src/pages/wms/index.vue index b5143f0..109f074 100644 --- a/src/pages/wms/index.vue +++ b/src/pages/wms/index.vue @@ -129,7 +129,7 @@ :label="item.menuName" label-pos="bottom" size="80" - :name="item.menuName == '盘点' ? '../../static/icons/icon-53.png' : '../../static/icons/icon-56.png'" + :name="item.menuName.includes('盘点') ? '../../static/icons/icon-53.png' : '../../static/icons/icon-56.png'" > @@ -150,7 +150,7 @@ :label="item.menuName" label-pos="bottom" size="80" - :name="item.menuName == '白胚入库' || '退货入库' ? '../../static/icons/icon-54.png' : item.menuName == '白胚出库' ? '../../static/icons/icon-55.png' : '../../static/icons/icon-56.png'" + :name="item.menuName.includes('入库') ? '../../static/icons/icon-54.png' : item.menuName.includes('出库') ? '../../static/icons/icon-55.png' : '../../static/icons/icon-56.png'" >