From 4939eb98f2b4f740127771398bc8e7d709e6d2df Mon Sep 17 00:00:00 2001 From: guoshuang Date: Mon, 11 Nov 2024 14:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=87=BA=E5=BA=93&=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=A2=86=E6=96=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 9 +- src/pages/login/login/index.vue | 2 +- src/pages/wms/Raw/ProductionREQ/index.vue | 12 +- src/pages/wms/Raw/SpecialDelivery/index.vue | 737 ++++++++++++++++++++ src/pages/wms/Raw/SpecialDelivery/model.ts | 106 +++ src/utils/url.ts | 4 + 6 files changed, 866 insertions(+), 4 deletions(-) create mode 100644 src/pages/wms/Raw/SpecialDelivery/index.vue create mode 100644 src/pages/wms/Raw/SpecialDelivery/model.ts diff --git a/src/pages.json b/src/pages.json index bee7b6b..cfc7b68 100644 --- a/src/pages.json +++ b/src/pages.json @@ -639,9 +639,16 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/SpecialDelivery/index", + "style": { + "navigationBarTitleText": "特殊出库", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } - ], diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index a2b06b5..6f34ad1 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.132'; //正式版本号 + version = '0.0.133'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue index 0e4c911..781ac7a 100644 --- a/src/pages/wms/Raw/ProductionREQ/index.vue +++ b/src/pages/wms/Raw/ProductionREQ/index.vue @@ -82,7 +82,7 @@ 数量: - + 删除 @@ -230,6 +230,7 @@ export default class ProductionREQ extends BasePage { if (model.getidcardcode == '200') { let alreadyList = model.byidcardobj; alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); + alreadyList.actuamount = alreadyList.amount; let tianjiaflage = this.materilist.some((item) => item.materialCode == alreadyList.materialCode); if (tianjiaflage) { this.materilist.forEach((item) => { @@ -282,7 +283,14 @@ export default class ProductionREQ extends BasePage { }); } } - confirmNumber(changeobj) { + confirmNumber(changeobj, index) { + if (changeobj.amount > changeobj.actuamount) { + (this.$refs.uToast as any).show({ + title: '该标志卡的输入数量不能大于标志卡的实际数量', + type: 'waring', + }); + this.list[index].amount = this.list[index].actuamount; + } let addnumber = 0; this.list.forEach((item) => { if (item.materialCode == changeobj.materialCode) { diff --git a/src/pages/wms/Raw/SpecialDelivery/index.vue b/src/pages/wms/Raw/SpecialDelivery/index.vue new file mode 100644 index 0000000..2310803 --- /dev/null +++ b/src/pages/wms/Raw/SpecialDelivery/index.vue @@ -0,0 +1,737 @@ + + + + diff --git a/src/pages/wms/Raw/SpecialDelivery/model.ts b/src/pages/wms/Raw/SpecialDelivery/model.ts new file mode 100644 index 0000000..e78498c --- /dev/null +++ b/src/pages/wms/Raw/SpecialDelivery/model.ts @@ -0,0 +1,106 @@ +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.SpecialDelivery', +}) +export class SpecialDelivery extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async ProductionMaterialRequisition(orderNo: any) { + const result: any = await http.post(url.lanjuwms.raw.SpecialDelivery.ProductionMaterialRequisitionSC, { + // headers: { + // poolName: session.PoolName, + // }, + produceCode: orderNo, + factoryCode: session.FactoryCode, + }); + // http.defaults.headers.common['Accept-Language'] = session.PoolName; + const orderNoItemList = result.data.map((element: any) => ({ + label: element.materialDesc, + value: element.materialCode, + ...element, + })); + return { orderNoItemList }; + } + information: any = []; + @MutationAction + async queryinformation(item: any) { + const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, { + ...item, + factoryCode: session.FactoryCode, + }); + const information = result.data.map((element: any) => ({ + label: element.userDefined1, + value: element.userDefined1, + ...element, + })); + return { information }; + } + TraysList: any = {}; + @MutationAction + async showTrays(item: any) { + const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, { + ...item, + factoryCode: session.FactoryCode, + }); + const TraysList = result.data[0]; + return { TraysList }; + } + SubmitCode: any = ''; + selloutconntraydata: any = {}; + @MutationAction + async selloutconntray(params: any) { + const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisitionsn, { + sn: params, + factoryCode: session.FactoryCode, + }); + const SubmitCode = result.code; + const selloutconntraydata = result.data; + return { SubmitCode, selloutconntraydata }; + } + @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.raw.SpecialDelivery.NewConMaterialOutSCNew, 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 }; + } + + ///扫描标志卡 + getidcardcode: any = ''; + byidcardobj: any = {}; + @MutationAction + async getByidcard(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.SweepMaterialCardSC, data); + const getidcardcode = result.code; + const byidcardobj = result.data; + return { getidcardcode, byidcardobj }; + } +} + +export default getModule(SpecialDelivery); diff --git a/src/utils/url.ts b/src/utils/url.ts index e47321e..346e525 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -178,6 +178,10 @@ export const url = { ArrivalRecord: { getArrivalRecord: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistrationreader', }, + SpecialDelivery: { + ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/listOdsProcureOutOrderTS', + NewConMaterialOutSCNew: qianzhuione + '/wms/WmsToWCSmission/OdsProcureOutOrderTSCK', + }, }, WhiteManagement: { WhiteInstorage: {