diff --git a/src/pages.json b/src/pages.json index 4a4066f..aefefe7 100644 --- a/src/pages.json +++ b/src/pages.json @@ -407,6 +407,30 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/TrayStatusUpdate/index", + "style": { + "navigationBarTitleText": "托盘状态更新", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/wms/Raw/SpecifyPalletOut/index", + "style": { + "navigationBarTitleText": "包材指定托盘出库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/wms/Raw/MatReturnWH/index", + "style": { + "navigationBarTitleText": "包材半托返库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } ], "globalStyle": { diff --git a/src/pages/wms/Raw/MatReturnWH/index.vue b/src/pages/wms/Raw/MatReturnWH/index.vue new file mode 100644 index 0000000..962c391 --- /dev/null +++ b/src/pages/wms/Raw/MatReturnWH/index.vue @@ -0,0 +1,524 @@ + + + + diff --git a/src/pages/wms/Raw/MatReturnWH/model.ts b/src/pages/wms/Raw/MatReturnWH/model.ts new file mode 100644 index 0000000..face311 --- /dev/null +++ b/src/pages/wms/Raw/MatReturnWH/model.ts @@ -0,0 +1,22 @@ +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.Raw.MatReturnWH', +}) +export class MatReturnWH extends VuexModule { + SubmitCode: any = ''; + @MutationAction + async out(params: any) { + const result: any = await http.post(url.lanjuwms.raw.MatReturnWH.into, params); + const SubmitCode = result.code; + return { SubmitCode }; + } +} + +export default getModule(MatReturnWH); diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index 382e14b..96aac88 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -218,6 +218,7 @@ export default class receivePO extends BasePage { query.planNumber = this.form3.planNumber; query.whCode = this.productCodeTypeList.warehouseCode; query.factoryCode = session.FactoryCode; + query.incomeBatchNo = this.form3.incomeBatchNo; await this.model.PurchaseOrderdeliPda(query); console.log(this.model.SubmitCode); if (this.model.SubmitCode.code == 200) { @@ -271,13 +272,20 @@ export default class receivePO extends BasePage { }); return; } - let query = { + let item = { procureCode: this.procureCode, - materialCode: this.materialCode, factoryCode: session.FactoryCode, }; - await this.model.PurchaseOrderPda(query); - this.list = model.orderNoItemList; + await this.model.sapPurchaseOrderSync(item); + if (model.sapPurchasecode == '200') { + let query = { + procureCode: this.procureCode, + materialCode: this.materialCode, + factoryCode: session.FactoryCode, + }; + await this.model.PurchaseOrderPda(query); + this.list = model.orderNoItemList; + } } histroyItem: any = {}; barcode: any = ''; diff --git a/src/pages/wms/Raw/ReceivePO/model.ts b/src/pages/wms/Raw/ReceivePO/model.ts index e267cd0..a63d851 100644 --- a/src/pages/wms/Raw/ReceivePO/model.ts +++ b/src/pages/wms/Raw/ReceivePO/model.ts @@ -19,6 +19,13 @@ export class receivePO extends VuexModule { const orderNoItemList = result.data; return { orderNoItemList }; } + sapPurchasecode: any = ''; + @MutationAction + async sapPurchaseOrderSync(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.sapPurchaseOrderSync, data); + const sapPurchasecode = result.code; + return { sapPurchasecode }; + } SubmitCode: any = ''; @MutationAction async PurchaseOrderdeliPda(data: any) { diff --git a/src/pages/wms/Raw/SpecifyPalletOut/index.vue b/src/pages/wms/Raw/SpecifyPalletOut/index.vue new file mode 100644 index 0000000..f7f69c6 --- /dev/null +++ b/src/pages/wms/Raw/SpecifyPalletOut/index.vue @@ -0,0 +1,508 @@ + + + + diff --git a/src/pages/wms/Raw/SpecifyPalletOut/model.ts b/src/pages/wms/Raw/SpecifyPalletOut/model.ts new file mode 100644 index 0000000..d140f87 --- /dev/null +++ b/src/pages/wms/Raw/SpecifyPalletOut/model.ts @@ -0,0 +1,22 @@ +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.Raw.SpecifyPalletOut', +}) +export class SpecifyPalletOut extends VuexModule { + SubmitCode: any = ''; + @MutationAction + async out(params: any) { + const result: any = await http.post(url.lanjuwms.raw.SpecifyPalletOut.out, params); + const SubmitCode = result.code; + return { SubmitCode }; + } +} + +export default getModule(SpecifyPalletOut); diff --git a/src/pages/wms/Raw/TrayStatusUpdate/index.vue b/src/pages/wms/Raw/TrayStatusUpdate/index.vue new file mode 100644 index 0000000..488fc84 --- /dev/null +++ b/src/pages/wms/Raw/TrayStatusUpdate/index.vue @@ -0,0 +1,518 @@ + + + + diff --git a/src/pages/wms/Raw/TrayStatusUpdate/model.ts b/src/pages/wms/Raw/TrayStatusUpdate/model.ts new file mode 100644 index 0000000..2d9ad4e --- /dev/null +++ b/src/pages/wms/Raw/TrayStatusUpdate/model.ts @@ -0,0 +1,22 @@ +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.Raw.TrayStatusUpdate', +}) +export class TrayStatusUpdate extends VuexModule { + SubmitCode: any = ''; + @MutationAction + async out(params: any) { + const result: any = await http.post(url.lanjuwms.raw.TrayStatusUpdate.out, params); + const SubmitCode = result.code; + return { SubmitCode }; + } +} + +export default getModule(TrayStatusUpdate); diff --git a/src/utils/page.ts b/src/utils/page.ts index 036161e..5a1ea9d 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -31,5 +31,8 @@ export const page = { SaleOutWH: '/pages/wms/product/SaleOutWH/index', OfflineStorage: '/pages/wms/product/OfflineStorage/index', ProductionREQ: '/pages/wms/Raw/ProductionREQ/index', + TrayStatusUpdate: '/pages/wms/Raw/TrayStatusUpdate/index', + SpecifyPalletOut: '/pages/wms/Raw/SpecifyPalletOut/index', + MatReturnWH: '/pages/wms/Raw/MatReturnWH/index', }, }; diff --git a/src/utils/url.ts b/src/utils/url.ts index 917fdd5..92732ed 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -73,6 +73,7 @@ export const url = { PurchaseOrderdetailPda: qianzhuione + '/wms/order/PurchaseOrderdetailPda', // 手持 查询仓库管理列表 list: qianzhuione + '/wms/order/listCK', + sapPurchaseOrderSync: qianzhuione + '/wms/WmsToWCSmission/sapPurchaseOrderSync', }, PurchaseWHPO: { // 手持 －－包材采购单采购收货查询 @@ -90,6 +91,15 @@ export const url = { ProductionMaterialRequisitionsn: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionsn', out: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionAdd', }, + TrayStatusUpdate: { + out: qianzhuione + '/wms/order/TraystatusUpdate', + }, + SpecifyPalletOut: { + out: qianzhuione + '/wms/order/DesignatedPalletOutbound', + }, + MatReturnWH: { + into: '/wms/order/InventoryPlanIssuance', + }, }, }, // 设备管理