diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 3bdc222..665eb30 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -138,6 +138,7 @@ export default { Pi_tip6: '本次拣配数量+拣配数量不允许大于需求数量', Pi_tip8: '本次交接数量+交接数量不允许大于拣配数量', Pi_tip9: '本次补料数量+已补数量不允许大于需求数量', + Pi_tip12: '本次交接数量必须等于已拣配数量', JJSLBNWK: '交接数量不能为空', Pi_tip7: '请选中要修改的行', Pi_tip11: '交接数量大于拣配数量,将产生虚拟库存', @@ -150,6 +151,7 @@ export default { Pi_PickedQuantity: '已拣配数量', Pi_QuantityHandedOver: '已交接数量', Pi_distribution: '分配', + successful: '查询成功', //汇总交接 Summary_Query: '汇总查询', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index d9cc77b..c6cea21 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -21,9 +21,11 @@ export default { request_Tip9: 'Service Unavailable', request_Tip10: 'Gateway timeout', request_Tip11: 'HTTP version is not supported', + Pi_tip12: 'The current handover quantity must be equal to the picked quantity', Inventory_query: 'Inventory query', success: 'Success', error: 'Error', + successful: 'query was successful', operation: 'operation', //服务器设置 ServerSetting: 'Server Setting', diff --git a/src/pages/raw/handover/aggregating/config.ts b/src/pages/raw/handover/aggregating/config.ts index 64d21b8..8c285a6 100644 --- a/src/pages/raw/handover/aggregating/config.ts +++ b/src/pages/raw/handover/aggregating/config.ts @@ -1,11 +1,11 @@ /** * 汇总查询表格列 */ -import vm from "@/main"; +import vm from '@/main'; export const headers = [ { - label: vm.$t("message.Pi_OrderNo"), - key: "prdOrder", + label: vm.$t('message.Pi_OrderNo'), + key: 'prdOrder', width: 550, }, ]; @@ -15,51 +15,51 @@ export const headers = [ */ export const resultHeaders = [ { - label: vm.$t("message.po_MaterielNo"), - key: "materialCode", + label: vm.$t('message.po_MaterielNo'), + key: 'materialCode', width: 220, }, { - label: vm.$t("message.po_DemandQuantity"), - key: "amount", + label: vm.$t('message.po_DemandQuantity'), + key: 'amount', }, { - label: vm.$t("message.Pi_CumulativePickingQuantity"), - key: "totalMoAmount", + label: vm.$t('message.Pi_CumulativePickingQuantity'), + key: 'totalMoAmount', width: 300, }, { - label: vm.$t("message.Pi_HandoverQuantity"), - key: "totalHvAmount", + label: vm.$t('message.Pi_HandoverQuantity'), + key: 'totalHvAmount', }, { - label: vm.$t("message.Pi_Station"), - key: "sendSpot", + label: vm.$t('message.Pi_Station'), + key: 'sendSpot', }, { - label: vm.$t("message.po_MaterielDes"), - key: "materialDesc", + label: vm.$t('message.po_MaterielDes'), + key: 'materialDesc', width: 350, }, { - label: "MRP", - key: "mrpCode", + label: 'MRP', + key: 'mrpCode', }, { - label: vm.$t("message.Pi_unit"), - key: "unit", + label: vm.$t('message.Pi_unit'), + key: 'unit', }, { - label: vm.$t("message.Pi_OrderNo"), - key: "prdOrder", + label: vm.$t('message.Pi_OrderNo'), + key: 'prdOrder', }, { - label: vm.$t("message.Pi_FinishedProductModel"), - key: "proType", + label: vm.$t('message.Pi_FinishedProductModel'), + key: 'proType', }, { - label: vm.$t("message.po_Location"), - key: "wkposCode", + label: vm.$t('message.po_Location'), + key: 'wkposCode', }, ]; @@ -68,47 +68,47 @@ export const resultHeaders = [ */ export const summaryHeaders = [ { - label: vm.$t("message.po_MaterielNo"), - key: "materialCode", + label: vm.$t('message.po_MaterielNo'), + key: 'materialCode', width: 220, }, { - label: vm.$t("message.Summary_QuantityOfThisHandover"), - key: "hvAmount", + label: vm.$t('message.Summary_QuantityOfThisHandover'), + key: 'hvAmount', }, { - label: vm.$t("message.po_DemandQuantity"), - key: "amount", + label: vm.$t('message.po_DemandQuantity'), + key: 'amount', }, { - label: vm.$t("message.Pi_CumulativePickingQuantity"), - key: "totalMoAmount", + label: vm.$t('message.Pi_CumulativePickingQuantity'), + key: 'totalMoAmount', width: 300, }, { - label: vm.$t("message.Pi_HandoverQuantity"), - key: "totalHvAmount", + label: vm.$t('message.Pi_HandoverQuantity'), + key: 'totalHvAmount', }, { - label: vm.$t("message.Pi_Station"), - key: "sendSpot", + label: vm.$t('message.Pi_Station'), + key: 'sendSpot', }, { - label: vm.$t("message.po_MaterielDes"), - key: "materialDesc", + label: vm.$t('message.po_MaterielDes'), + key: 'materialDesc', width: 350, }, { - label: vm.$t("message.Pi_unit"), - key: "unit", + label: vm.$t('message.Pi_unit'), + key: 'unit', }, { - label: vm.$t("message.Summary_FinishedProductMaterialNumber"), - key: "prdMaterialCode", + label: vm.$t('message.Summary_FinishedProductMaterialNumber'), + key: 'prdMaterialCode', }, { - label: vm.$t("message.po_Location"), - key: "wkposCode", + label: vm.$t('message.po_Location'), + key: 'wkposCode', }, ]; @@ -117,54 +117,54 @@ export const summaryHeaders = [ */ export const orderHeaders = [ { - label: vm.$t("message.po_MaterielNo"), - key: "materialCode", + label: vm.$t('message.po_MaterielNo'), + key: 'materialCode', width: 220, }, { - label: vm.$t("message.Summary_QuantityOfThisHandover"), - key: "hvAmount", + label: vm.$t('message.Summary_QuantityOfThisHandover'), + key: 'hvAmount', }, { - label: vm.$t("message.po_DemandQuantity"), - key: "amount", + label: vm.$t('message.po_DemandQuantity'), + key: 'amount', }, { - label: vm.$t("message.Pi_CumulativePickingQuantity"), - key: "totalMoAmount", + label: vm.$t('message.Pi_CumulativePickingQuantity'), + key: 'totalMoAmount', width: 300, }, { - label: vm.$t("message.Pi_HandoverQuantity"), - key: "totalHvAmount", + label: vm.$t('message.Pi_HandoverQuantity'), + key: 'totalHvAmount', }, { - label: vm.$t("message.Pi_Station"), - key: "sendSpot", + label: vm.$t('message.Pi_Station'), + key: 'sendSpot', }, { - label: vm.$t("message.po_MaterielDes"), - key: "materialDesc", + label: vm.$t('message.po_MaterielDes'), + key: 'materialDesc', width: 350, }, { - label: vm.$t("message.Pi_unit"), - key: "unit", + label: vm.$t('message.Pi_unit'), + key: 'unit', }, { - label: "MRP", - key: "mrpCode", + label: 'MRP', + key: 'mrpCode', }, { - label: vm.$t("message.Pi_OrderNo"), - key: "prdOrder", + label: vm.$t('message.Pi_OrderNo'), + key: 'prdOrder', }, { - label: vm.$t("message.Pi_FinishedProductModel"), - key: "proType", + label: vm.$t('message.Pi_FinishedProductModel'), + key: 'proType', }, { - label: vm.$t("message.po_Location"), - key: "wkposCode", + label: vm.$t('message.po_Location'), + key: 'wkposCode', }, ]; diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index 1673cf3..714e28b 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -35,16 +35,8 @@ - - + + @@ -122,27 +114,14 @@ --> - + - + @@ -156,9 +135,7 @@ {{ $t('message.dn_Confirm') }} - {{ - $t('message.po_Return') - }} + {{ $t('message.po_Return') }} @@ -272,7 +249,7 @@ export default class Aggregating extends BasePage { this.$form.setRules(this.rules); model.clearProOrderList(); //guoshuang 注掉 解决打开页面默认显示工厂号 - // this.form.sapFactoryCode = session.factoryCode; + // this.form.sapFactoryCode = session.factoryCode; } /** @@ -300,6 +277,7 @@ export default class Aggregating extends BasePage { orderNoList: orderNoList, }; await this.model.queryProOrderResult(params); + model.param = params; this.toPage(this.page.raw.handover.aggregating.result); }); } diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index 6c96ba9..05066f9 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -1,27 +1,21 @@ -import { - getModule, - Module, - Mutation, - Action, - MutationAction, - VuexModule, -} from "vuex-module-decorators"; -import store from "@/store"; -import http from "@/utils/request"; -import { url } from "@/utils/url"; -import { cloneDeep } from "lodash/fp"; +import { getModule, Module, Mutation, Action, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { cloneDeep } from 'lodash/fp'; @Module({ namespaced: true, dynamic: true, store, - name: "raw.handover.aggregating", + name: 'raw.handover.aggregating', }) export class AggregatingModule extends VuexModule { /** * 查询列表 */ proOrderList = []; + param: any; /** * 查询结果列表 @@ -116,13 +110,7 @@ export class AggregatingModule extends VuexModule { * @param params */ @Mutation - setAggregateListItemHvAmount({ - index, - hvAmount, - }: { - index: number; - hvAmount: number; - }) { + setAggregateListItemHvAmount({ index, hvAmount }: { index: number; hvAmount: number }) { const original = this.aggregateList[index]; const newItem = { ...original, hvAmount }; this.aggregateList.splice(index, 1, newItem); @@ -133,13 +121,7 @@ export class AggregatingModule extends VuexModule { * @param params */ @Mutation - setOrderListItemHvAmount({ - index, - hvAmount, - }: { - index: number; - hvAmount: number; - }) { + setOrderListItemHvAmount({ index, hvAmount }: { index: number; hvAmount: number }) { const original = this.orderList[index]; const newItem = { ...original, hvAmount }; this.orderList.splice(index, 1, newItem); @@ -159,13 +141,7 @@ export class AggregatingModule extends VuexModule { * @param params */ @Mutation - setAccessoryListItemHvAmount({ - index, - hvAmount, - }: { - index: number; - hvAmount: number; - }) { + setAccessoryListItemHvAmount({ index, hvAmount }: { index: number; hvAmount: number }) { const original = this.accessoryList[index]; const newItem = { ...original, hvAmount }; this.accessoryList.splice(index, 1, newItem); @@ -201,8 +177,8 @@ export class AggregatingModule extends VuexModule { proOrderList.forEach((_: any) => (_.checked = true)); if (!proOrderList.length) { uni.showToast({ - icon: "none", - title: "No Data Found！", + icon: 'none', + title: 'No Data Found！', }); } return { proOrderList }; @@ -214,10 +190,12 @@ export class AggregatingModule extends VuexModule { */ @MutationAction async queryProOrderResult(params: any) { - const { list: proOrderResultList }: any = await http.post( - url.sumscan.query.ordoutlist, - params - ); + const { list: proOrderResultList }: any = await http.post(url.sumscan.query.ordoutlist, params); + return { proOrderResultList }; + } + @MutationAction + async queryProOrders() { + const { list: proOrderResultList }: any = await http.post(url.sumscan.query.ordoutlist, this.param); return { proOrderResultList }; } @@ -227,14 +205,11 @@ export class AggregatingModule extends VuexModule { */ @MutationAction async queryAggregateList(params: any) { - const { list: aggregateList }: any = await http.post( - url.sumscan.query.hzlist, - params - ); + const { list: aggregateList }: any = await http.post(url.sumscan.query.hzlist, params); if (!aggregateList.length) { uni.showToast({ - icon: "none", - title: "No Data Found！", + icon: 'none', + title: 'No Data Found！', }); } return { aggregateList }; @@ -258,14 +233,11 @@ export class AggregatingModule extends VuexModule { */ @MutationAction async queryAccessoryList(params: any) { - const { list: accessoryList }: any = await http.post( - url.sumscan.query.fllist, - params - ); + const { list: accessoryList }: any = await http.post(url.sumscan.query.fllist, params); if (!accessoryList.length) { uni.showToast({ - icon: "none", - title: "No Data Found！", + icon: 'none', + title: 'No Data Found！', }); } return { accessoryList }; @@ -279,8 +251,8 @@ export class AggregatingModule extends VuexModule { async uploadOrderList(params: any) { await http.post(url.sumscan.u.order, params); uni.showToast({ - icon: "success", - title: "success", + icon: 'success', + title: 'success', }); } @@ -293,12 +265,9 @@ export class AggregatingModule extends VuexModule { return http.post(url.sumscan.u.fllist, params); } - @Action({ commit: "updateCheckedOrderInInfoListKw" }) + @Action({ commit: 'updateCheckedOrderInInfoListKw' }) async queryByFactoryCodeAndWorkAreaCode(content: any) { - let res = await http.post( - "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode", - content - ); + let res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content); return res; } } diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue index 4d69f5d..211c97e 100644 --- a/src/pages/raw/handover/aggregating/order.vue +++ b/src/pages/raw/handover/aggregating/order.vue @@ -8,7 +8,7 @@ - + @@ -185,35 +185,46 @@ export default class AggregatingOrder extends BasePage { const totalHvAmount = parseFloat(firstSelection.totalHvAmount); // 拣配数量 const totalMoAmount = parseFloat(firstSelection.totalMoAmount); - if (currentPickNum <= 0) { + // if (currentPickNum <= 0) { + // uni.showToast({ + // icon: 'none', + // title: this.$t('message.Pi_tip2') as string, + // }); + // return; + // } + if (currentPickNum != totalMoAmount) { uni.showToast({ icon: 'none', - title: this.$t('message.Pi_tip2') as string, + title: this.$t('message.Pi_tip12') as string, }); return; } - if (currentPickNum + totalHvAmount - totalMoAmount > 0.000001) { - uni.showModal({ - title: 'Tip', - content: this.$t('message.Pi_tip11') as string, - confirmText: this.$t('message.workArea_Confirm') as string, - cancelText: this.$t('message.Cancel') as string, - showCancel: true, - success: (res) => { - if (res.confirm) { - model.setOrderListItemHvAmount({ - index: this.model.orderList.findIndex((_) => _.checked), - hvAmount: currentPickNum, - }); - } - }, - }); - } else { - model.setOrderListItemHvAmount({ - index: this.model.orderList.findIndex((_) => _.checked), - hvAmount: currentPickNum, - }); - } + model.setOrderListItemHvAmount({ + index: this.model.orderList.findIndex((_) => _.checked), + hvAmount: currentPickNum, + }); + // if (currentPickNum + totalHvAmount - totalMoAmount > 0.000001) { + // uni.showModal({ + // title: 'Tip', + // content: this.$t('message.Pi_tip11') as string, + // confirmText: this.$t('message.workArea_Confirm') as string, + // cancelText: this.$t('message.Cancel') as string, + // showCancel: true, + // success: (res) => { + // if (res.confirm) { + // model.setOrderListItemHvAmount({ + // index: this.model.orderList.findIndex((_) => _.checked), + // hvAmount: currentPickNum, + // }); + // } + // }, + // }); + // } else { + // model.setOrderListItemHvAmount({ + // index: this.model.orderList.findIndex((_) => _.checked), + // hvAmount: currentPickNum, + // }); + // } } }); } @@ -302,19 +313,21 @@ export default class AggregatingOrder extends BasePage { this.submitForm.receiver = ''; this.submitForm.receiverName = ''; this.submitForm.password = ''; + await this.model.queryProOrders(); + this.toPage(this.page.raw.handover.aggregating.order); // setTimeout(() => { // uni.navigateBack({ delta: 2 }); // }, 2000); // uni.navigateBack({ delta: 2 }); - uni.showModal({ - title: this.$t('message.Pi_tip') as string, - content: this.$t('message.Warehouse_Tip9') as string, - confirmText: this.$t('message.workArea_Confirm') as string, - showCancel: false, - success: () => { - this.toPage(this.page.raw.handover.aggregating.index); - }, - }); + // uni.showModal({ + // title: this.$t('message.Pi_tip') as string, + // content: this.$t('message.Warehouse_Tip9') as string, + // confirmText: this.$t('message.workArea_Confirm') as string, + // showCancel: false, + // success: () => { + // this.toPage(this.page.raw.handover.aggregating.index); + // }, + // }); } } }); diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue index 32950ff..1d213a6 100644 --- a/src/pages/raw/handover/aggregating/summary.vue +++ b/src/pages/raw/handover/aggregating/summary.vue @@ -8,7 +8,7 @@ - + @@ -194,28 +194,39 @@ export default class AggregatingSummary extends BasePage { // }); // return; // } - if (currentPickNum + totalHvAmount - totalMoAmount > 0.000001) { - uni.showModal({ - title: 'Tip', - content: this.$t('message.Pi_tip11') as string, - confirmText: this.$t('message.workArea_Confirm') as string, - cancelText: this.$t('message.Cancel') as string, - showCancel: true, - success: (res) => { - if (res.confirm) { - model.setAggregateListItemHvAmount({ - index: this.model.aggregateList.findIndex((_) => _.checked), - hvAmount: currentPickNum, - }); - } - }, - }); - } else { - model.setAggregateListItemHvAmount({ - index: this.model.aggregateList.findIndex((_) => _.checked), - hvAmount: currentPickNum, + if (currentPickNum != totalMoAmount) { + uni.showToast({ + icon: 'none', + title: this.$t('message.Pi_tip12') as string, }); + return; } + model.setAggregateListItemHvAmount({ + index: this.model.aggregateList.findIndex((_) => _.checked), + hvAmount: currentPickNum, + }); + // if (currentPickNum + totalHvAmount - totalMoAmount > 0.000001) { + // uni.showModal({ + // title: 'Tip', + // content: this.$t('message.Pi_tip11') as string, + // confirmText: this.$t('message.workArea_Confirm') as string, + // cancelText: this.$t('message.Cancel') as string, + // showCancel: true, + // success: (res) => { + // if (res.confirm) { + // model.setAggregateListItemHvAmount({ + // index: this.model.aggregateList.findIndex((_) => _.checked), + // hvAmount: currentPickNum, + // }); + // } + // }, + // }); + // } else { + // model.setAggregateListItemHvAmount({ + // index: this.model.aggregateList.findIndex((_) => _.checked), + // hvAmount: currentPickNum, + // }); + // } } }); } @@ -314,19 +325,21 @@ export default class AggregatingSummary extends BasePage { this.submitForm.receiverName = ''; this.submitForm.password = ''; this.isBusinessFinished = true; + await this.model.queryProOrders(); + this.toPage(this.page.raw.handover.aggregating.summary); // uni.navigateBack({ delta: 2 }); // setTimeout(() => { // uni.navigateBack({ delta: 2 }); // }, 2000); - uni.showModal({ - title: this.$t('message.Pi_tip') as string, - content: this.$t('message.Warehouse_Tip9') as string, - confirmText: this.$t('message.workArea_Confirm') as string, - showCancel: false, - success: () => { - this.toPage(this.page.raw.handover.aggregating.index); - }, - }); + // uni.showModal({ + // title: this.$t('message.Pi_tip') as string, + // content: this.$t('message.Warehouse_Tip9') as string, + // confirmText: this.$t('message.workArea_Confirm') as string, + // showCancel: false, + // success: () => { + // this.toPage(this.page.raw.handover.aggregating.index); + // }, + // }); // uni.navigateBack({ delta: 1 }); // model.clearProOrderResultList(); } diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue index c675aec..08e8417 100644 --- a/src/pages/raw/handover/picking/ByOrder.vue +++ b/src/pages/raw/handover/picking/ByOrder.vue @@ -4,84 +4,51 @@ - {{ $t("message.Pi_ByOrderPicking") }} + {{ $t('message.Pi_ByOrderPicking') }} - + - {{ $t("message.Pi_Station") }}: + {{ $t('message.Pi_Station') }}: {{ some.sendSpot }} - {{ $t("message.Pi_PickedQuantity") }}: + {{ $t('message.Pi_PickedQuantity') }}: {{ some.totalMoAmount }} - {{ $t("message.CommissionedLocation") }}: - + {{ $t('message.CommissionedLocation') }}: + - {{ $t("message.CommissionedThisNumber") }}: - + {{ $t('message.CommissionedThisNumber') }}: + - {{ - $t("message.product_add") - }} + {{ $t('message.product_add') }} - {{ $t("message.product_Location") }} - {{ $t("message.product_Number") }} - {{ $t("message.operation") }} + {{ $t('message.product_Location') }} + {{ $t('message.product_Number') }} + {{ $t('message.operation') }} {{ item.wlCode }} {{ item.qty }}
- {{ $t("message.product_Delete") }} + {{ $t('message.product_Delete') }}
@@ -95,18 +62,16 @@
- {{ - $t("message.detailed") - }} + {{ $t('message.detailed') }} - {{ $t("message.po_Submit") }} + {{ $t('message.po_Submit') }} - {{ $t("message.po_Return") }} + {{ $t('message.po_Return') }} @@ -116,14 +81,14 @@