From abbdf211a302acff192831eeaab56ed0bef88477 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Thu, 6 Jan 2022 11:29:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E6=9E=84=20=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E5=80=9F=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 2 + src/i18n/lang/en.ts | 2 + .../product/warehouse/wholeCollect/index.vue | 225 ++++++++++++------ .../product/warehouse/wholeCollect/model.ts | 51 ++-- .../product/warehouse/wholeScrap/index.vue | 83 +++---- 5 files changed, 216 insertions(+), 147 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index d26df54..7ea55e8 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -197,8 +197,10 @@ export default { return_Tip4: '退料数量不能大于总数', quantitys: '不能大于应退货数量', actual: '实际退货数量不等于应退货数量', + Requisition: '领用单', greater: '不能大于总数', receiveAStation: '接收工位', + collecting: '请输入领用单号', //库内主菜单 Warehouse: '成品库内', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index a9b85e4..9785a11 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -216,6 +216,7 @@ export default { InventoryTotalNumber: 'Total', InventoryPleaseScan: 'Please scan No.', InventoryFinish: 'Finish', + collecting: 'Please enter the collecting doc No', // 委外-入库 CommissionEntrant: 'Subcontracting receipt', @@ -224,6 +225,7 @@ export default { CommissionedMaterielDesc: 'describe', SourceLocation: 'Source location', barcode: 'Please enter barcode', + Requisition: 'Requisition', scrapForm: 'Please scan the scrap form first', finishedProduct: 'Please select finished product code first', CommissionedDemandData: 'Demand', diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue index a6acf9a..2bc35b8 100644 --- a/src/pages/product/warehouse/wholeCollect/index.vue +++ b/src/pages/product/warehouse/wholeCollect/index.vue @@ -8,37 +8,50 @@ - - - - + + + + {{ $t('message.Requisition') }} + + + + {{ $t('message.Query') }} + + - + - + - + - - - + + + - + + + + + - - {{ $t('message.workArea_Confirm') }} + + {{ $t('message.detailed') }} - + + {{ $t('message.InventoryFinish') }} + + {{ $t('message.po_Return') }} @@ -50,33 +63,27 @@ import { Component, Ref } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import { VForm, VFormRules } from 'vue/types/form'; import model from './model'; +import jPicker from '@/components/J-Picker/jPicker.vue'; import { session } from '@/store/modules/session'; interface OptionType { label: string; value: string; } -@Component +@Component({ + components: { + jPicker, + }, +}) export default class ProductCheckReceipt extends BasePage { @Ref('form') readonly $form!: VForm; model = model; //表单 form = { - ...this.model.orderInInfo, - originWl: {} as OptionType, - aimWl: {} as OptionType, - qty: {} as OptionType, + order3: '', + barcode: '', }; - originWlSelect = false; - aimWlSelect = false; - cboPlaceSelect = false; - rules: VFormRules = { - documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }], - originWl: [{ required: true, message: this.$t('message.Warehouse_Tip2') as string }], - aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }], - cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }], - }; - value = ''; - show = false; + wl: any = {}; + Some: any = {}; // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 onReady() { this.model.orderInInfo.productDescZh = ''; @@ -84,49 +91,107 @@ export default class ProductCheckReceipt extends BasePage { this.model.orderInInfo.qty = ''; this.model.orderInInfo.locCode = ''; this.model.orderInInfo.costCenter = ''; - this.$form.setRules(this.rules); - this.model.queryLocation(); } - onSubmit() { - this.$form.validate((valid: boolean) => { - if (!valid) return; - if (!this.form.productCode) { - uni.showToast({ - icon: 'none', - title: this.$t('message.Warehouse_Tip5') as string, - }); - return; + //单号查询 + async query() { + if (!this.form.order3) { + uni.showToast({ + icon: 'none', + title: this.$t('message.Commission_tips1') as string, + }); + return; + } + let param = { + factoryCode: session.factoryCode, + loginName: session.loginName, + order3: this.form.order3, + orderType: 'LY', + page: '1', + rows: '50', + }; + await this.model.queryScrapList(param); + if (this.model.code == '1') { + uni.showToast({ + icon: 'none', + title: this.$t('message.product_Tip8') as string, + }); + this.wl.value = this.model.choiceCodeList[0].value; + this.Some = this.model.recordsList[0]; + } + } + //选择成品编码 + materialChoice(e: any) { + this.wl = e.pickerName; + this.model.recordsList.forEach((item: any) => { + if (item.productCode == e.pickerName.value) { + this.Some = item; } - if (!this.model.orderInInfo.costCenter) { - uni.showToast({ - icon: 'none', - title: this.$t('message.Warehouse_Tip8') as string, - }); - return; - } - console.log('orderlist'); - const orderlist = [ - { - ...this.model.orderInInfo, - // originWl: this.form.originWl.value, - originWl: this.model.orderInInfo.locCode, - // aimWl: this.form.aimWl.value, custcode - type: '0', - orderType: '2', - keepBy: session.loginName, - factoryCode: session.factoryCode, - }, - ]; - console.log('orderlist', orderlist); - this.model.onTakeoutConfirm(orderlist); - this.model.orderInInfo.productDescZh = ''; - this.model.orderInInfo.productCode = ''; - this.model.orderInInfo.qty = ''; - this.model.orderInInfo.locCode = ''; - this.model.orderInInfo.costCenter = ''; - this.form.productCode = ''; }); } + //条码扫码 + async scanning() { + if (!this.form.order3) { + uni.showToast({ + icon: 'none', + title: this.$t('message.scrapForm') as string, + }); + } + if (!this.Some) { + uni.showToast({ + icon: 'none', + title: this.$t('message.finishedProduct') as string, + }); + } + if (!this.form.barcode) { + uni.showToast({ + icon: 'none', + title: this.$t('message.barcode') as string, + }); + return; + } + let params = { + factoryCode: session.factoryCode, + loginName: session.loginName, + barcode: this.form.barcode, + productCode: this.wl.value, + locCode: this.Some.originWl, + }; + await this.model.getProductCode(params); + if (this.model.code == '1') { + uni.showToast({ + icon: 'none', + title: this.$t('message.product_Tip8') as string, + }); + } + } + //确定 + async onSubmit() { + const orderlist = [ + { + ...this.model.orderInInfo, + originWl: this.Some.originWl, + barCode: this.form.barcode, + aimWl: this.Some.aimWl, + type: '0', + orderType: '2', + keepBy: session.loginName as string, + factoryCode: session.factoryCode as string, + order3: this.form.order3, + costCenter: this.Some.costCenter, + }, + ]; + await this.model.onTakeoutConfirm(orderlist); + if (this.model.code == '1') { + uni.showToast({ + icon: 'none', + title: this.$t('message.success') as string, + }); + } + this.Some = {}; + this.wl = {}; + this.form.order3 = ''; + this.form.barcode = ''; + } } From c680596f71690359c242d803887f73b81dd6949c Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Thu, 6 Jan 2022 18:03:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=9B=98=E7=82=B9=20=E4=BF=AE=E5=A4=8D=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 9 + src/i18n/lang/en.ts | 9 + src/pages.json | 8 + .../warehouse/MaterialInventory/index.vue | 308 ++++++++++++++++++ .../warehouse/MaterialInventory/model.ts | 91 ++++++ .../product/warehouse/wholeCollect/index.vue | 4 +- .../product/warehouse/wholeScrap/index.vue | 13 +- src/pages/raw/handover/aggregating/model.ts | 4 + src/pages/raw/warehouse/rowScrap/config.ts | 4 + src/utils/page.ts | 204 ++++++------ src/utils/url.ts | 5 + 11 files changed, 552 insertions(+), 107 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 7ea55e8..c360bef 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -42,6 +42,7 @@ export default { workArea_WorkAreaName: '工作区名称', workArea_WarehouseClassify: '仓库类', workArea_Confirm: '确定', + ReservoirArea: '库区', //原材料菜单 rawMenu_ReceivingGoods: '收货', rawMenu_Handover: '交接', @@ -155,6 +156,9 @@ export default { Pi_QuantityHandedOver: '已交接数量', Pi_distribution: '分配', successful: '查询成功', + ModelCode: '型号编码', + ModelName: '型号名称', + ModelScanned: '型号已扫', //汇总交接 Summary_Query: '汇总查询', @@ -201,6 +205,7 @@ export default { greater: '不能大于总数', receiveAStation: '接收工位', collecting: '请输入领用单号', + MaterialCount: '物料盘点', //库内主菜单 Warehouse: '成品库内', @@ -226,6 +231,7 @@ export default { InventoryMateriel: '物料名', InventoryTotalNumber: '盘点总数', InventoryPleaseScan: '请扫描单号', + InventoryNumber: '盘点单号', InventoryFinish: '完成', // 委外-入库 @@ -371,8 +377,10 @@ export default { Warehouse_Tip5: '请扫描单号', Warehouse_Tip6: '请选择物料', Warehouse_Tip7: '盘点未完成，确定继续吗', + selectCode: '请先选择编码', Warehouse_Tip8: '请输入成本中心', Warehouse_Tip9: '操作成功', + DocumentNumber: '文件号', Warehouse_Tip10: '请选择sap库存地点', Warehouse_Tip11: '该单号不存在或已经操作完成', Warehouse_TotalNumber: '总数', @@ -381,6 +389,7 @@ export default { Warehouse_WX: '外销', Warehouse_YJ: '样机', Warehouse_BCP: '半成品', + DocumentScanned: '单据已扫', //提示 AppendMateriel1: '请输入正确的库位和数量', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 9785a11..294ef9d 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -217,6 +217,15 @@ export default { InventoryPleaseScan: 'Please scan No.', InventoryFinish: 'Finish', collecting: 'Please enter the collecting doc No', + MaterialCount: 'Material count', + InventoryNumber: 'Inventory number', + DocumentScanned: 'Document scanned', + ReservoirArea: 'Reservoir area', + ModelCode: 'Model code', + ModelName: 'Model name', + ModelScanned: 'Model scanned', + selectCode: 'Please select code first', + DocumentNumber: 'Document number', // 委外-入库 CommissionEntrant: 'Subcontracting receipt', diff --git a/src/pages.json b/src/pages.json index 6f5a80d..d745c1f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -25,6 +25,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/product/warehouse/MaterialInventory/index", + "style": { + "navigationBarTitleText": "物料盘点", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/product/outbound/index", "style": { diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue index e69de29..189981e 100644 --- a/src/pages/product/warehouse/MaterialInventory/index.vue +++ b/src/pages/product/warehouse/MaterialInventory/index.vue @@ -0,0 +1,308 @@ + + + diff --git a/src/pages/product/warehouse/MaterialInventory/model.ts b/src/pages/product/warehouse/MaterialInventory/model.ts index e69de29..a4d8d08 100644 --- a/src/pages/product/warehouse/MaterialInventory/model.ts +++ b/src/pages/product/warehouse/MaterialInventory/model.ts @@ -0,0 +1,91 @@ +import { Action, 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'; +// import { page } from '@/utils/page'; +import vm from '@/main'; + +class OrderInInfo { + productDescZh?: string; + qty?: string; + custCode?: string; + custCodeName?: string; + productCode?: string; + locCode?: string; + costCenter?: string; +} + +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'product.warehouse.wholeCollect', +}) +export class wholeCollect extends VuexModule { + WlList = []; + code: any = ''; + recordsList: any = []; + choiceCodeList: any = []; + dnNo = ''; + orderInInfo: OrderInInfo = new OrderInInfo(); + modelList: any = []; + status: any = ''; + + @MutationAction + async queryLocation() { + const result: any = await http.get(url.warehouse.wholeTransfer.list, { + params: { + factoryCode: session.factoryCode, + loginName: session.loginName, + }, + }); + // console.log('库位数据',result) + const WlList = result.data.map((_: any) => ({ + label: _.locationCode, + value: _.locationCode, + })); + return { WlList }; + } + + @MutationAction + async queryScrapList(param: any) { + const res: any = await http.post(url.warehouse.MaterialInventory.list, param); + const code = res.code; + const modelList = res.data; + console.log('modelList', modelList); + return { code, modelList }; + } + /** + * 查询单号 + * 查询DN单号 + * @param dnNo + */ + @MutationAction + async getProductCode(params: any) { + const res: any = await http.post(url.warehouse.MaterialInventory.content, params); + const code = res.code; + console.log('resssss', res); + return { code }; + } + + @MutationAction + async onTakeoutConfirm(params: any) { + const records: any = await http.post(url.warehouse.MaterialInventory.commit, params); + const status = records.data.status; + return { status }; + } + + @Action({ commit: 'updateCheckedOrderInInfoListKw' }) + async changeOrderInLocation(kw: string) { + await http.post('/wmspda/material/orderin/enter', { + loginName: session.loginName, + warehouseCode: '', + factoryCode: session.factoryCode, + locationCode: kw, + }); + return kw; + } +} + +export default getModule(wholeCollect); diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue index 2bc35b8..d335945 100644 --- a/src/pages/product/warehouse/wholeCollect/index.vue +++ b/src/pages/product/warehouse/wholeCollect/index.vue @@ -35,8 +35,8 @@ - - + + diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue index ef29824..bcc1ebc 100644 --- a/src/pages/product/warehouse/wholeScrap/index.vue +++ b/src/pages/product/warehouse/wholeScrap/index.vue @@ -35,12 +35,16 @@ - + - - + + + + + + @@ -50,7 +54,7 @@ - {{ $t('message.detailed') }} + {{ $t('message.detailed') }} {{ $t('message.InventoryFinish') }} @@ -186,6 +190,7 @@ export default class productCheckReceipt extends BasePage { factoryCode: session.factoryCode as string, order3: this.form.order3, costCenter: this.Some.costCenter, + fileNo: this.Some.fileNo, }, ]; await this.model.onTakeoutConfirm(orderlist); diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index 24d1812..66e8359 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -236,6 +236,10 @@ export class AggregatingModule extends VuexModule { const { queryParams, proOrderResultList } = params; await http.post(url.sumscan.lock.list, queryParams); const orderList = cloneDeep(proOrderResultList); + console.log('orderList', orderList); + if (orderList.length == 0) { + return { orderList }; + } return { orderList }; } /** diff --git a/src/pages/raw/warehouse/rowScrap/config.ts b/src/pages/raw/warehouse/rowScrap/config.ts index 995a8be..0815c81 100644 --- a/src/pages/raw/warehouse/rowScrap/config.ts +++ b/src/pages/raw/warehouse/rowScrap/config.ts @@ -34,6 +34,10 @@ export const headers = [ label: vm.$t('message.product_costCenter'), key: 'costCenter', }, + { + label: vm.$t('message.DocumentNumber'), + key: 'fileNo', + }, // { // label: '库存地点', // key: 'wkposCode', diff --git a/src/utils/page.ts b/src/utils/page.ts index f453cd9..3569f5f 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -1,171 +1,173 @@ export const page = { index: { - index: "/pages/index/index", + index: '/pages/index/index', }, demo: { - index: "/pages/demo/index", + index: '/pages/demo/index', }, login: { - login: "/pages/login/login/index", - server: "/pages/login/server/index", - area: "/pages/login/area/index", + login: '/pages/login/login/index', + server: '/pages/login/server/index', + area: '/pages/login/area/index', }, product: { - index: "/pages/product/index", + index: '/pages/product/index', inbound: { // index: '/pages/product/inbound/index', // index2: '/pages/product/inbound/index2', - index3: "/pages/product/inbound/index3", - offlineIn: "/pages/product/inbound/offline-in/index", - finishProductOffline: "/pages/product/inbound/finishProductOffline/index", + index3: '/pages/product/inbound/index3', + offlineIn: '/pages/product/inbound/offline-in/index', + finishProductOffline: '/pages/product/inbound/finishProductOffline/index', // semiFinishProductOfflineRefrigerator: // '/pages/product/inbound/semiFinishProductOfflineRefrigerator/index', - semiFinishProductOffline2: - "/pages/product/inbound/semiFinishProductOffline2/index", + semiFinishProductOffline2: '/pages/product/inbound/semiFinishProductOffline2/index', // semiFinishProductOnlineDoor: '/pages/product/inbound/semiFinishProductOnlineDoor/index', // semiFinishProductOnlineBox: '/pages/product/inbound/semiFinishProductOnlineBox/index', }, outbound: { - index: "/pages/product/outbound/index", - internal: "/pages/product/outbound/internal/index", - foreign: "/pages/product/outbound/foreign/index", - stoOutbound: "/pages/product/outbound/stoOutbound/index", - delivergoods: "/pages/product/outbound/stoOutbound/DN-delivergoods", - stoOutboundDetail: "/pages/product/outbound/stoOutbound/detail", + index: '/pages/product/outbound/index', + internal: '/pages/product/outbound/internal/index', + foreign: '/pages/product/outbound/foreign/index', + stoOutbound: '/pages/product/outbound/stoOutbound/index', + delivergoods: '/pages/product/outbound/stoOutbound/DN-delivergoods', + stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail', }, warehouse: { - index: "/pages/product/warehouse/index", + index: '/pages/product/warehouse/index', wholeTransfer: { - index: "/pages/product/warehouse/wholeTransfer/index", - Local: "/pages/product/warehouse/wholeTransfer/Local-details", + index: '/pages/product/warehouse/wholeTransfer/index', + Local: '/pages/product/warehouse/wholeTransfer/Local-details', }, wholeScrap: { - index: "/pages/product/warehouse/wholeScrap/index", + index: '/pages/product/warehouse/wholeScrap/index', }, wholeCollect: { - index: "/pages/product/warehouse/wholeCollect/index", + index: '/pages/product/warehouse/wholeCollect/index', + }, + MaterialInventory: { + index: '/pages/product/warehouse/MaterialInventory/index', }, wholeLnventory: { - index: "/pages/product/warehouse/wholeLnventory/index", + index: '/pages/product/warehouse/wholeLnventory/index', }, }, }, raw: { - index: "/pages/raw/index", + index: '/pages/raw/index', appointment: { - index: "/pages/raw/appointment/index", - checkin: "/pages/raw/appointment/checkin/index", - checkinList: "/pages/raw/appointment/checkin/list", - checkout: "/pages/raw/appointment/checkout/index", + index: '/pages/raw/appointment/index', + checkin: '/pages/raw/appointment/checkin/index', + checkinList: '/pages/raw/appointment/checkin/list', + checkout: '/pages/raw/appointment/checkout/index', }, handover: { - index: "/pages/raw/handover/index", + index: '/pages/raw/handover/index', kanDan: { - index: "/pages/raw/handover/kan-dan/index", - details: "/pages/raw/handover/kan-dan/details", + index: '/pages/raw/handover/kan-dan/index', + details: '/pages/raw/handover/kan-dan/details', }, picking: { - index: "/pages/raw/handover/picking/index", - result: "/pages/raw/handover/picking/result", - summary: "/pages/raw/handover/picking/summary", - bysummary: "/pages/raw/handover/picking/BySummary", - order: "/pages/raw/handover/picking/order", - idetailed: "/pages/raw/handover/picking/idetailed", - query: "/pages/raw/handover/picking/query", - total: "/pages/raw/handover/picking/total", - byorder: "/pages/raw/handover/picking/ByOrder", - Local: "/pages/raw/handover/picking/Local-details", - SummaryLocal: "/pages/raw/handover/picking/Summary-details", + index: '/pages/raw/handover/picking/index', + result: '/pages/raw/handover/picking/result', + summary: '/pages/raw/handover/picking/summary', + bysummary: '/pages/raw/handover/picking/BySummary', + order: '/pages/raw/handover/picking/order', + idetailed: '/pages/raw/handover/picking/idetailed', + query: '/pages/raw/handover/picking/query', + total: '/pages/raw/handover/picking/total', + byorder: '/pages/raw/handover/picking/ByOrder', + Local: '/pages/raw/handover/picking/Local-details', + SummaryLocal: '/pages/raw/handover/picking/Summary-details', }, feeding: { - index: "/pages/raw/handover/feeding/index", - detail: "/pages/raw/handover/feeding/detail", - Location: "/pages/raw/handover/feeding/Location", - Local: "/pages/raw/handover/feeding/Local-details", + index: '/pages/raw/handover/feeding/index', + detail: '/pages/raw/handover/feeding/detail', + Location: '/pages/raw/handover/feeding/Location', + Local: '/pages/raw/handover/feeding/Local-details', }, returning: { - index: "/pages/raw/handover/returning/index", - filter: "/pages/raw/handover/returning/Time-filter", + index: '/pages/raw/handover/returning/index', + filter: '/pages/raw/handover/returning/Time-filter', }, aggregating: { - index: "/pages/raw/handover/aggregating/index", - result: "/pages/raw/handover/aggregating/result", - order: "/pages/raw/handover/aggregating/order", - summary: "/pages/raw/handover/aggregating/summary", - accessory: "/pages/raw/handover/aggregating/accessory", + index: '/pages/raw/handover/aggregating/index', + result: '/pages/raw/handover/aggregating/result', + order: '/pages/raw/handover/aggregating/order', + summary: '/pages/raw/handover/aggregating/summary', + accessory: '/pages/raw/handover/aggregating/accessory', }, virtual: { - index: "/pages/raw/handover/virtual/index", - result: "/pages/raw/handover/virtual/result", - summary: "/pages/raw/handover/virtual/summary", + index: '/pages/raw/handover/virtual/index', + result: '/pages/raw/handover/virtual/result', + summary: '/pages/raw/handover/virtual/summary', }, }, ingoods: { - index: "/pages/raw/ingoods/index", + index: '/pages/raw/ingoods/index', receipt: { - index: "/pages/raw/ingoods/receipt/index", - detail: "/pages/raw/ingoods/receipt/detail", - detailEx: "/pages/raw/ingoods/receipt/detail-ex", + index: '/pages/raw/ingoods/receipt/index', + detail: '/pages/raw/ingoods/receipt/detail', + detailEx: '/pages/raw/ingoods/receipt/detail-ex', }, poReceipt: { - index: "/pages/raw/ingoods/poReceipt/index", - detail: "/pages/raw/ingoods/poReceipt/detail", - detailEx: "/pages/raw/ingoods/poReceipt/detail-ex", - idetailed: "/pages/raw/ingoods/poReceipt/idetailed", - poReceiving: "/pages/raw/ingoods/poReceipt/poReceiving", - bill: "/pages/raw/ingoods/poReceipt/bill", + index: '/pages/raw/ingoods/poReceipt/index', + detail: '/pages/raw/ingoods/poReceipt/detail', + detailEx: '/pages/raw/ingoods/poReceipt/detail-ex', + idetailed: '/pages/raw/ingoods/poReceipt/idetailed', + poReceiving: '/pages/raw/ingoods/poReceipt/poReceiving', + bill: '/pages/raw/ingoods/poReceipt/bill', }, dnReceipt: { - index: "/pages/raw/ingoods/dnReceipt/index", - detail: "/pages/raw/ingoods/dnReceipt/detail", - detailEx: "/pages/raw/ingoods/dnReceipt/detail-ex", - idetailed: "/pages/raw/ingoods/dnReceipt/idetailed", - dnReceiving: "/pages/raw/ingoods/dnReceipt/dnReceiving", - importDN: "/pages/raw/ingoods/dnReceipt/ImportDN", - bill: "/pages/raw/ingoods/dnReceipt/bill", - Local: "/pages/raw/ingoods/dnReceipt/Local-details", + index: '/pages/raw/ingoods/dnReceipt/index', + detail: '/pages/raw/ingoods/dnReceipt/detail', + detailEx: '/pages/raw/ingoods/dnReceipt/detail-ex', + idetailed: '/pages/raw/ingoods/dnReceipt/idetailed', + dnReceiving: '/pages/raw/ingoods/dnReceipt/dnReceiving', + importDN: '/pages/raw/ingoods/dnReceipt/ImportDN', + bill: '/pages/raw/ingoods/dnReceipt/bill', + Local: '/pages/raw/ingoods/dnReceipt/Local-details', }, dnReturnGoods: { - index: "/pages/raw/ingoods/dnReturnGoods/index", - detail: "/pages/raw/ingoods/dnReturnGoods/detail", - location: "/pages/raw/ingoods/dnReturnGoods/Location", - Local: "/pages/raw/ingoods/dnReturnGoods/Local-details", - detailEx: "/pages/raw/ingoods/dnReturnGoods/detail-ex", - idetailed: "/pages/raw/ingoods/dnReturnGoods/idetailed", + index: '/pages/raw/ingoods/dnReturnGoods/index', + detail: '/pages/raw/ingoods/dnReturnGoods/detail', + location: '/pages/raw/ingoods/dnReturnGoods/Location', + Local: '/pages/raw/ingoods/dnReturnGoods/Local-details', + detailEx: '/pages/raw/ingoods/dnReturnGoods/detail-ex', + idetailed: '/pages/raw/ingoods/dnReturnGoods/idetailed', }, }, warehouse: { - index: "/pages/raw/warehouse/index", + index: '/pages/raw/warehouse/index', rowTransfer: { - index: "/pages/raw/warehouse/rowTransfer/index", - details: "/pages/raw/warehouse/rowTransfer/details", + index: '/pages/raw/warehouse/rowTransfer/index', + details: '/pages/raw/warehouse/rowTransfer/details', }, rowScrap: { - index: "/pages/raw/warehouse/rowScrap/index", - details: "/pages/raw/warehouse/rowScrap/details", + index: '/pages/raw/warehouse/rowScrap/index', + details: '/pages/raw/warehouse/rowScrap/details', }, rowCollect: { - index: "/pages/raw/warehouse/rowCollect/index", - details: "/pages/raw/warehouse/rowCollect/details", + index: '/pages/raw/warehouse/rowCollect/index', + details: '/pages/raw/warehouse/rowCollect/details', }, rowInventory: { - index: "/pages/raw/warehouse/rowInventory/index", + index: '/pages/raw/warehouse/rowInventory/index', }, }, commission: { - index: "/pages/raw/commission/index", + index: '/pages/raw/commission/index', entrant: { - index: "/pages/raw/commission/entrant/index", - detail: "/pages/raw/commission/entrant/detail", + index: '/pages/raw/commission/entrant/index', + detail: '/pages/raw/commission/entrant/detail', }, goOut: { - index: "/pages/raw/commission/goOut/index", - detail: "/pages/raw/commission/goOut/detail", + index: '/pages/raw/commission/goOut/index', + detail: '/pages/raw/commission/goOut/detail', }, }, }, SemiProduct: { - index: "/pages/SemiProduct/index", + index: '/pages/SemiProduct/index', // inbound: { // index: '/pages/SemiProduct/inbound/index', // index2: '/pages/SemiProduct/inbound/index2', @@ -175,20 +177,20 @@ export const page = { // semiFinishProductOnlineBox: '/pages/SemiProduct/inbound/semiFinishProductOnlineBox/index', // }, outbound: { - index: "/pages/SemiProduct/outbound/index", + index: '/pages/SemiProduct/outbound/index', }, inbound: { - index: "/pages/SemiProduct/inbound/index", + index: '/pages/SemiProduct/inbound/index', }, DumpList: { - index: "/pages/SemiProduct/DumpList/index", + index: '/pages/SemiProduct/DumpList/index', DumpListFH: { - index: "/pages/SemiProduct/DumpList/DumpListFH/index", - detail: "/pages/SemiProduct/DumpList/DumpListFH/detail", + index: '/pages/SemiProduct/DumpList/DumpListFH/index', + detail: '/pages/SemiProduct/DumpList/DumpListFH/detail', }, DumpListSH: { - index: "/pages/SemiProduct/DumpList/DumpListSH/index", - detail: "/pages/SemiProduct/DumpList/DumpListSH/detail", + index: '/pages/SemiProduct/DumpList/DumpListSH/index', + detail: '/pages/SemiProduct/DumpList/DumpListSH/detail', }, }, }, diff --git a/src/utils/url.ts b/src/utils/url.ts index eac86cf..10ec196 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -197,6 +197,11 @@ export const url = { rowCollect: { list: '/wmspda/fg/listByOrder', }, + MaterialInventory: { + list: '/wmspda/fg/findMaterialByPddNoWl', + content: '/wmspda/fg/inventoryUploadSn', + commit: '/wmspda/fg/completePd', + }, wholeTransfer: { list: '/wmspda/fg/getMdLocation', content: '/wmspda/fg/getMaterialByCode',