diff --git a/src/pages.json b/src/pages.json index 6ce278b..bee7b6b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -631,6 +631,14 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/ReturnMaterials/index", + "style": { + "navigationBarTitleText": "退料", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/equipment/SparepartsInto/model.ts b/src/pages/equipment/SparepartsInto/model.ts index d47c0cb..ece9216 100644 --- a/src/pages/equipment/SparepartsInto/model.ts +++ b/src/pages/equipment/SparepartsInto/model.ts @@ -13,7 +13,7 @@ export class SparepartsInto extends VuexModule { orderNoItemList: any = []; @MutationAction async queryOrderNo(orderNo: any) { - const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode + orderNo); + const result: any = await http.post(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode, { materialCode: orderNo }); const orderNoItemList = result.data; return { orderNoItemList }; } diff --git a/src/pages/equipment/SparepartsIntoOut/model.ts b/src/pages/equipment/SparepartsIntoOut/model.ts index b852322..e93ad14 100644 --- a/src/pages/equipment/SparepartsIntoOut/model.ts +++ b/src/pages/equipment/SparepartsIntoOut/model.ts @@ -13,7 +13,7 @@ export class SparepartsIntoOut extends VuexModule { orderNoItemList: any = []; @MutationAction async queryOrderNo(orderNo: any) { - const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode + orderNo); + const result: any = await http.post(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode, { materialCode: orderNo }); const orderNoItemList = result.data; return { orderNoItemList }; } diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 6a2c7c0..ab5affd 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.108'; //正式版本号 + version = '0.0.109'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue index ab3039a..4dc809a 100644 --- a/src/pages/quality/Materialinspection/index.vue +++ b/src/pages/quality/Materialinspection/index.vue @@ -2037,8 +2037,8 @@ export default class PurchaseWHSRM extends BasePage { text-align: center; background: #5a9cf8; color: #ffffff; - margin-top: 5px; - padding: 5px; + margin-top: 10rpx; + padding: 10rpx; } .page-product-receipt { background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat; @@ -2173,7 +2173,7 @@ export default class PurchaseWHSRM extends BasePage { text-align: center; background: #fa3534; color: #ffffff; - margin-top: 10px; + margin-top: 20rpx; } .zhuangtai { @@ -2302,11 +2302,11 @@ export default class PurchaseWHSRM extends BasePage { z-index: 9999; /* 确保遮罩层在最上层 */ } .selectlist { - margin-top: 15px; - border-radius: 5px; + margin-top: 30rpx; + border-radius: 10rpx; // border: rgba(121, 121, 121, 1) solid 1px; // background-color: #ffffff; - padding: 7px 8px 7px 12px; + padding: 14rpx 16rpx 14rpx 24rpx; box-sizing: border-box; .item-name { .quest { @@ -2314,17 +2314,17 @@ export default class PurchaseWHSRM extends BasePage { // border-radius: 5px; // border: rgba(121, 121, 121, 1) solid 1px; // background-color: #ffffff; - padding: 7px 8px 7px 12px; + padding: 14rpx 16rpx 14rpx 24rpx; box-sizing: border-box; text-align: center; - font-size: 18px; + font-size: 36rpx; } .details { display: flex; - font-size: 15px; + font-size: 30rpx; // justify-content: space-between; align-items: center; - margin-bottom: 8px; + margin-bottom: 16rpx; } } .single-left { @@ -2332,22 +2332,22 @@ export default class PurchaseWHSRM extends BasePage { // align-items: center; // justify-content: space-around; text-align: center; - margin-top: 12px; - margin-bottom: 20px; - border: 1px solid #eee; + margin-top: 24rpx; + margin-bottom: 40rpx; + border: 2rpx solid #eee; } .item { - margin-top: 15px; - width: 344px; - border-radius: 5px; - border: rgba(121, 121, 121, 1) solid 1px; + margin-top: 30rpx; + width: 100%; + border-radius: 10rpx; + border: rgba(121, 121, 121, 1) solid 2rpx; // background-color: #ffffff; - padding: 7px 8px 7px 8px; + padding: 14rpx 16rpx 14rpx 16rpx; box-sizing: border-box; .item1 { - margin-bottom: 3px; - white-space: 1px; - font-size: 15px; + margin-bottom: 6rpx; + white-space: 2rpx; + font-size: 30rpx; font-weight: 600; } .item2 { @@ -2355,28 +2355,28 @@ export default class PurchaseWHSRM extends BasePage { align-items: center; // justify-content: space-between; .select { - font-size: 15px; + font-size: 30rpx; font-weight: 400; display: flex; // margin-left: 19px; } .input-box { - font-size: 13px; + font-size: 26rpx; font-weight: 400; display: flex; align-content: center; - margin-top: 2px; + margin-top: 4rpx; .input { - font-size: 12px; + font-size: 24rpx; width: 56%; - padding: 1px 8px; - height: 27px; + padding: 2rpx 16rpx; + height: 54rpx; box-sizing: border-box; - border: 1px solid #b6b6b6; - margin-left: 6px; + border: 2rpx solid #b6b6b6; + margin-left: 12rpx; display: inline-block; - margin-right: 6px; - border-radius: 4px; + margin-right: 12rpx; + border-radius: 8rpx; position: relative; } } @@ -2390,27 +2390,27 @@ export default class PurchaseWHSRM extends BasePage { } .modal { .upload-name { - padding: 6px 20px; + padding: 12rpx 40rpx; display: flex; justify-content: space-between; .name { - font-size: 17px; + font-size: 34rpx; font-weight: 600; } } .tagsbox { - padding: 10px 20px; + padding: 20rpx 40rpx; .tags { - margin-right: 5px; + margin-right: 10rpx; } } } .Belowsform3 { background-color: #fff; - padding: 7px 8px 7px 12px; + padding: 14rpx 16rpx 14rpx 24rpx; .u-form-item { line-height: 35rpx; - font-size: 16px; + font-size: 32rpx; } .photoList { display: flex; @@ -2492,14 +2492,14 @@ export default class PurchaseWHSRM extends BasePage { } ::v-deep .uni-input-placeholder { font-weight: 500; - left: 10px; + left: 20rpx; } ::v-deep .uni-textarea-placeholder { font-weight: 500; } ::v-deep .Belowsform3 .uni-input-input { width: 97%; - border: 1px solid #dcdfe6; + border: 2rpx solid #dcdfe6; } .selected-form { background-color: #f0f0f0; /* 示例背景色 */ diff --git a/src/pages/quality/index.vue b/src/pages/quality/index.vue index b3e526b..679c10f 100644 --- a/src/pages/quality/index.vue +++ b/src/pages/quality/index.vue @@ -175,30 +175,30 @@ export default class RawAppointment extends BasePage { } .container1 { - width: 280px; + width: 560rpx; margin: auto; - box-shadow: 0px 0px 6px 0px #a6a3a3; - border-radius: 3px; + box-shadow: 0rpx 0rpx 12rpx 0rpx #a6a3a3; + border-radius: 6rpx; padding: 20rpx; .title { font-weight: 600; } .content { - margin-top: 10px; + margin-top: 20rpx; .menu1 { width: 49%; text-align: center; .item1 { - margin-top: 10px; + margin-top: 20rpx; } .item2 { - margin-top: 10px; - margin-bottom: 10px; + margin-top: 20rpx; + margin-bottom: 20rpx; color: #94d1f4; } } .menu1active { - border-right: 1px solid #d8d6d6; + border-right: 2rpx solid #d8d6d6; } } } diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index e9ff296..0b1ca1b 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -18,6 +18,9 @@ 提单 + + + @@ -181,6 +184,8 @@ export default class receiveSRM extends BasePage { waCodeTypeList: any = {}; moren = '选择仓库'; moren1 = '选择库区'; + reducelist: any = []; + oldprodlist: any = []; waylist = [ // { // value: '0', @@ -215,11 +220,6 @@ export default class receiveSRM extends BasePage { clickitem: any = ''; productCodeList: any = {}; receiptNoCode = ''; - async onReady() { - //await this.model.Stashlist(); - // this.whList = model.DictTypeList; - //this.remove = this.model.WlList[0]; - } //生成收货单号 generate() { const today = dayjs().format('YYYYMMDDHHmmss'); @@ -237,83 +237,6 @@ export default class receiveSRM extends BasePage { this.czNumber = ''; } //点击收货按钮，录入批次（或系统自动生成）、数量、托盘码进行收货。 - async onOk() { - console.log(this.form3); - // if (this.form3.incomeBatchNo == '' || this.form3.incomeBatchNo == undefined) { - // (this.$refs.uToast as any).show({ - // title: '批次号不能为空', - // type: 'default', - // }); - // return; - // } - if (this.form3.planNumber == '' || this.form3.planNumber == undefined) { - (this.$refs.uToast as any).show({ - title: '数量不能为空', - type: 'default', - }); - return; - } - if (this.form3.sn == '' && this.selectway == true) { - (this.$refs.uToast as any).show({ - title: '托盘号不能为空', - type: 'default', - }); - return; - } - if (this.productCodeTypeList.value == '' || this.productCodeTypeList.value == undefined) { - (this.$refs.uToast as any).show({ - title: '请选择仓库', - type: 'default', - }); - return; - } - if (this.waCodeTypeList.value == '' || this.waCodeTypeList.value == undefined) { - (this.$refs.uToast as any).show({ - title: '请选择库区', - type: 'default', - }); - return; - } - if (this.receiptNoCode == '' || this.receiptNoCode == undefined) { - (this.$refs.uToast as any).show({ - title: '请先生成收货单号', - type: 'default', - }); - return; - } - console.log('1234567'); - let query = this.clickitem; - // query.applyList = this.Sparepartlist; - query.workStatus = this.form3.workStatus; - if (this.selectway == true) { - query.sn = this.form3.sn; - } else { - query.sn = dayjs().format('YYYYMMDDHHmmss'); - } - query.planNumber = this.form3.planNumber; - query.whCode = this.productCodeTypeList.warehouseCode; - query.waCode = this.waCodeTypeList.value; - query.factoryCode = session.FactoryCode; - query.userDefined6 = this.form3.userDefined6; - query.receiptNoCode = this.receiptNoCode; - query.poLine = this.clickitem.userDefined3; - await this.model.PurchaseOrderdeliPda(query); - console.log(this.model.SubmitCode); - if (this.model.SubmitCode.code == 200) { - (this.$refs.uToast as any).show({ - title: '成功', - type: 'default', - }); - this.show = false; - this.query(); - // this.ProcureOrderAlready(); - } else { - (this.$refs.uToast as any).show({ - title: '失败', - type: this.model.SubmitCode.msg, - }); - } - } async onFormDoubleClick(item) { console.log('双击', item); //await this.model.OnSubmit(item.id); @@ -324,6 +247,14 @@ export default class receiveSRM extends BasePage { url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)), }); } + uniqueArray(arr) { + return arr.reduce((accumulator, current) => { + if (!accumulator.some((item) => item.materialCode === current.materialCode)) { + accumulator.push(current); + } + return accumulator; + }, []); + } //查询货单关联采购单信息 async query() { console.log(session); @@ -344,7 +275,14 @@ export default class receiveSRM extends BasePage { }; await this.model.PurchaseOrderPda(query); let prodlist = model.orderNoItemList; - this.list = prodlist.map((item) => { + this.reducelist = this.uniqueArray(prodlist); + this.reducelist.forEach((item) => { + item.value = item.materialCode; + item.label = item.materialDesc; + }); + console.log('this.reducelist', this.reducelist); + this.bimWl = this.reducelist[0]; + this.oldprodlist = prodlist.map((item) => { let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); return { ...item, @@ -352,9 +290,19 @@ export default class receiveSRM extends BasePage { realityaddNumber: item.realityNumber, }; }); + this.list = this.oldprodlist.filter((item) => { + return item.materialCode == this.bimWl.value; + }); this.receivedlist = []; } - + selectProductCodeType(e) { + console.log(e); + this.bimWl = e.pickerName; + this.receivedlist = []; + this.list = this.oldprodlist.filter((item) => { + return item.materialCode == this.bimWl.value; + }); + } //送货单提单 async tidandelivery() { if (this.userDefined5 == '' || this.userDefined5.length == 0) { @@ -477,6 +425,7 @@ export default class receiveSRM extends BasePage { (this.$refs.uToast as any).show({ title: model.submitmsg, type: 'primary', + duration: 6000, }); this.receiptNoCode = ''; this.receivedlist = []; diff --git a/src/pages/wms/Raw/ReturnMaterials/index.vue b/src/pages/wms/Raw/ReturnMaterials/index.vue new file mode 100644 index 0000000..2f3e597 --- /dev/null +++ b/src/pages/wms/Raw/ReturnMaterials/index.vue @@ -0,0 +1,662 @@ + + + + diff --git a/src/pages/wms/Raw/ReturnMaterials/model.ts b/src/pages/wms/Raw/ReturnMaterials/model.ts new file mode 100644 index 0000000..8b068da --- /dev/null +++ b/src/pages/wms/Raw/ReturnMaterials/model.ts @@ -0,0 +1,113 @@ +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.ReturnMaterials', +}) +export class ReturnMaterials extends VuexModule { + orderNoItemList: any = []; + @MutationAction + async ProductionMaterialRequisition(orderNo: any) { + const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.listReturnSC, { + produceCode: orderNo, + factoryCode: session.FactoryCode, + }); + // http.defaults.headers.common['Accept-Language'] = session.PoolName; + const orderNoItemList = result.data; + 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.ReturnMaterials.addReturnSC, 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.ReturnMaterials.selectOrderCardTL, data); + const getidcardcode = result.code; + const byidcardobj = result.data; + return { getidcardcode, byidcardobj }; + } + //最新仓库查询 + workloclist: any = {}; + @MutationAction + async getworkloc(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.listTableCK, data); + const workloclist = result.data; + // let workloclist = oldworkloclist.map((item: any) => ({ + // label: item.warehouseName, + // value: item.warehouseCode, + // ...item, + // })); + //let wacode = oldwacode[0].areaCode; + return { workloclist }; + } +} + +export default getModule(ReturnMaterials); diff --git a/src/utils/url.ts b/src/utils/url.ts index 4bc0f2f..107b5e7 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -159,6 +159,11 @@ export const url = { ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionSC', NewConMaterialOutSC: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSC', }, + ReturnMaterials: { + listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC', + addReturnSC: qianzhuione + '/wms/WmsToWCSmission/addReturnSC', + selectOrderCardTL: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTL', + }, TrayStatusUpdate: { out: qianzhuione + '/wms/order/TraystatusUpdate', },