diff --git a/.vscode/settings.json b/.vscode/settings.json index 1f13ebc..e09ac67 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,7 +15,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[vue]": { - "editor.defaultFormatter": "octref.vetur" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[json]": { "editor.defaultFormatter": "esbenp.prettier-vscode" diff --git a/src/pages.json b/src/pages.json index 918fc42..c42e924 100644 --- a/src/pages.json +++ b/src/pages.json @@ -447,6 +447,22 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/WhiteManagement/WhiteInstorage/index", + "style": { + "navigationBarTitleText": "白胚入库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/wms/WhiteManagement/WhiteOutstorage/index", + "style": { + "navigationBarTitleText": "白胚出库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/wms/WhiteManagement/WhiteInstorage/index.vue b/src/pages/wms/WhiteManagement/WhiteInstorage/index.vue new file mode 100644 index 0000000..d847603 --- /dev/null +++ b/src/pages/wms/WhiteManagement/WhiteInstorage/index.vue @@ -0,0 +1,792 @@ + + + diff --git a/src/pages/wms/WhiteManagement/WhiteInstorage/model.ts b/src/pages/wms/WhiteManagement/WhiteInstorage/model.ts new file mode 100644 index 0000000..e493355 --- /dev/null +++ b/src/pages/wms/WhiteManagement/WhiteInstorage/model.ts @@ -0,0 +1,78 @@ +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.WhiteManagement.WhiteInstorage', +}) +// http.defaults.headers.common['poolName'] = session.PoolName; +export class WhiteInstorage extends VuexModule { + WlList = []; + orderNoItemList: any = {}; + Picilist: any = []; + @MutationAction + async queryOrderNo(orderNo: any) { + const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteInstorage.selectWmsOdsWhiteEmbryoInhAnd, { + orderCode: orderNo, + siteCode: session.FactoryCode, + // headers: { + // poolName: session.PoolName, + // }, + }); + // http.defaults.headers.common['Accept-Language'] = session.PoolName; + const orderNoItemList = result.data; + const proOrderWorkorderBatchList = result.data.proOrderWorkorderBatchList; + const Picilist = proOrderWorkorderBatchList.map((item) => ({ + ...item, + label: item.batchCode, + value: item.batchCode, + })); + return { orderNoItemList, Picilist }; + } + 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.WhiteManagement.WhiteInstorage.addtWmsOdsWhiteEmbryoInhAnd, 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(WhiteInstorage); diff --git a/src/pages/wms/WhiteManagement/WhiteOutstorage/index.vue b/src/pages/wms/WhiteManagement/WhiteOutstorage/index.vue new file mode 100644 index 0000000..6b82eec --- /dev/null +++ b/src/pages/wms/WhiteManagement/WhiteOutstorage/index.vue @@ -0,0 +1,651 @@ + + + diff --git a/src/pages/wms/WhiteManagement/WhiteOutstorage/model.ts b/src/pages/wms/WhiteManagement/WhiteOutstorage/model.ts new file mode 100644 index 0000000..fb41ea5 --- /dev/null +++ b/src/pages/wms/WhiteManagement/WhiteOutstorage/model.ts @@ -0,0 +1,66 @@ +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.WhiteManagement.WhiteOutstorage', +}) +export class WhiteOutstorage extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async showProduceCode(orderNo: any) { + const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteOutstorage.selectWhiteEmbryoDeliveryOrder, { + produceCode: orderNo, + siteCode: session.FactoryCode, + }); + // http.defaults.headers.common['Accept-Language'] = session.PoolName; + const orderNoItemList = result.data.list; + 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(boxnumber: string) { + const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteOutstorage.selectQueryTrayInfor, { + sn: boxnumber, + factoryCode: session.FactoryCode, + }); + const scanreturndata = result.data; + const SubmitCode = result.code; + return { scanreturndata, SubmitCode }; + } + @MutationAction + async deleteTray(item: any) { + console.log(item); + const result: any = await http.delete(url.lanjuwms.product.SaleOutWH.deleteTray + '/' + item.barcode); + const SubmitCode = result.code; + return { SubmitCode }; + } + @MutationAction + async out(params: any) { + const result: any = await http.post(url.lanjuwms.WhiteManagement.WhiteOutstorage.WhiteEmbryoOutbound, params); + const SubmitCode = result.code; + return { SubmitCode }; + } +} + +export default getModule(WhiteOutstorage); diff --git a/src/pages/wms/index.vue b/src/pages/wms/index.vue index 2040d97..8aa3c9a 100644 --- a/src/pages/wms/index.vue +++ b/src/pages/wms/index.vue @@ -133,6 +133,50 @@ > + + + + 白胚管理 + + + + + + + +