diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 0d19c1b..8854fc4 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -570,7 +570,8 @@ export default { supplierName: '供应商名称', PickingVn: '拣配-越南', HandoverVn: '交接-越南', - FactorySTOoutbound: '工厂间STO 出库', - FactorySTOStorage: '工厂间STO 入库', + detail: '详情', + pcNo: '批次号', + stoPcPleaseInput: '请输入批次号', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index d07afb5..76ccbff 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -572,7 +572,8 @@ export default { supplierName: 'supplier', PickingVn: 'Picking-Vn', HandoverVn: 'Handover-Vn', - FactorySTOoutbound: 'STO outbound between factories', - FactorySTOStorage: 'STO storage between factories', + detail: 'Detail', + pcNo: 'Batch No', + stoPcPleaseInput: 'Please input batch No', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index a5621ec..cd7d67f 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -567,7 +567,8 @@ export default { HeaderText: 'Примечания', supplierCode: 'Код поставщика', supplierName: 'Название поставщика', - FactorySTOoutbound: 'Заводское хранилище STO', - FactorySTOStorage: 'Заводское хранилище СТО', + detail: 'Detail', + pcNo: 'Batch No', + stoPcPleaseInput: 'Please input batch No', }, }; diff --git a/src/pages.json b/src/pages.json index 95a39c2..501ca8f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -491,7 +491,7 @@ } }, { - "path": "pages/raw/handover/aggregating-vn/index",// 越南工厂 + "path": "pages/raw/handover/aggregating-Vn/index", // 越南工厂 "style": { "navigationBarTitleText": "汇总查询", "navigationStyle": "custom", // 隐藏系统导航栏 @@ -754,6 +754,38 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/handover/aggregating-Vn/result", + "style": { + "navigationBarTitleText": "汇总交接", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/handover/aggregating-Vn/summary", + "style": { + "navigationBarTitleText": "汇总交接", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/handover/aggregating-Vn/order", + "style": { + "navigationBarTitleText": "按单交接", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/handover/aggregating-Vn/accessory", + "style": { + "navigationBarTitleText": "辅料交接", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/handover/virtual/index", "style": { @@ -1332,6 +1364,14 @@ }, { "path": "pages/product/stoOutbound/index", + "style": { + "navigationBarTitleText": "成品STO出库", //成品sto出库（越南按照sto单号出库） + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/product/stoOutbound/detail", "style": { "navigationBarTitleText": "成品STO出库",//成品sto出库（越南按照sto单号出库） "navigationStyle": "custom", // 隐藏系统导航栏 @@ -1495,22 +1535,6 @@ "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } - }, - { - "path": "pages/raw/STO/FactorySTO-Outbound/index", - "style": { - "navigationBarTitleText": "工厂间STO调拨出库", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 - } - }, - { - "path": "pages/raw/STO/FactorySTO-Storage/index", - "style": { - "navigationBarTitleText": "工厂间STO调拨入库", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 - } } ], "globalStyle": { diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 226fbce..40eba3e 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -171,7 +171,7 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.39'; + this.Version = '1.1.38'; } else { this.Version = '1.0.52'; } diff --git a/src/pages/raw/STO/FactorySTO-Outbound/config.ts b/src/pages/raw/STO/FactorySTO-Outbound/config.ts deleted file mode 100644 index 2df3db1..0000000 --- a/src/pages/raw/STO/FactorySTO-Outbound/config.ts +++ /dev/null @@ -1,124 +0,0 @@ -/** - * 看单明细表格列 - */ -import vm from '@/main'; -export const headers = [ - { - label: vm.$t('message.Line'), - key: 'poLine', - }, - { - label: vm.$t('message.po_OddNumbers'), - key: 'poNo', - width: 350, - }, - { - label: vm.$t('message.Pi_materielNo'), - key: 'materialCode', - width: 350, - }, - { - label: vm.$t('message.CommissionedLocation'), - key: 'wlCode', - }, - { - label: vm.$t('message.product_Number'), - key: 'receiptAmount', - }, - { - label: vm.$t('message.Container'), - key: 'sn', //容器码 - width: 700, - }, -]; -export const Tabheaders = [ - { - label: vm.$t('message.STOInventoryOrderNo'), - key: 'stoNo', - width: 350, - }, - { - label: vm.$t('message.STOLine'), - key: 'stoItem', - width: 350, - }, - { - label: vm.$t('message.CommissionedLocation'), - key: 'wlCode', - width: 350, - }, - { - label: vm.$t('message.Container'), - key: 'barCode', - width: 350, - }, - { - label: vm.$t('message.product_Number'), - key: 'nowAmount', - }, -]; -export const ImportPOReceiveListHeaders = [ - { - label: vm.$t('message.po_OddNumbers'), - key: 'poNo', //po单号 - width: 350, - }, - { - label: vm.$t('message.Line'), - key: 'poLine', //行项目 - // width: 350, - }, - { - label: vm.$t('message.Pi_materielNo'), - key: 'materialCode', //物料号 - width: 350, - }, - { - label: vm.$t('message.CommissionedMaterielDesc'), - key: 'materialDesc', //物料描述 - width: 450, - }, - { - label: vm.$t('message.po_DemandQuantity'), - key: 'poAmount', //需求数量 - }, - { - label: vm.$t('message.Pi_unit'), - key: 'unit', //单位 - }, -]; -export const containerListHeaders = [ - { - label: vm.$t('message.Container'), - key: 'palletCode', //容器码 - width: 300, - }, - { - label: vm.$t('message.po_OddNumbers'), - key: 'poNo', //po单号 - width: 350, - }, - { - label: vm.$t('message.Line'), - key: 'poLine', //行项目 - // width: 350, - }, - { - label: vm.$t('message.Pi_materielNo'), - key: 'materialCode', //物料号 - width: 350, - }, - { - label: vm.$t('message.CommissionedMaterielDesc'), - key: 'materialDesc', //物料描述 - width: 450, - }, - { - label: vm.$t('message.po_DemandQuantity'), - key: 'poAmount', //需求数量 - }, - { - label: vm.$t('message.Pi_unit'), - key: 'unit', //单位 - }, -]; diff --git a/src/pages/raw/STO/FactorySTO-Outbound/index.vue b/src/pages/raw/STO/FactorySTO-Outbound/index.vue deleted file mode 100644 index 2f7566e..0000000 --- a/src/pages/raw/STO/FactorySTO-Outbound/index.vue +++ /dev/null @@ -1,607 +0,0 @@ - - - diff --git a/src/pages/raw/STO/FactorySTO-Outbound/model.ts b/src/pages/raw/STO/FactorySTO-Outbound/model.ts deleted file mode 100644 index e44a67c..0000000 --- a/src/pages/raw/STO/FactorySTO-Outbound/model.ts +++ /dev/null @@ -1,82 +0,0 @@ -/* - * @Author: zhou lei - * @Date: 2022-09-28 10:26:36 - * @LastEditTime: 2023-05-22 16:42:16 - * @LastEditors: zhou lei - * @Description: 修改为扫描条码出库 - * @FilePath: \hgwms-factory-app\src\pages\raw\STO\FactorySTO-Outbound\model.ts - * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 - */ -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: 'raw.STO.FactorySTO-Outbound.index', -}) -export class ReceiptModule extends VuexModule { - //俄罗斯 STO出库 扫描DN单号 - dnNoList: any = []; - DnLineList: any = []; - @MutationAction - async QuerydnNo(dnNo: any) { - console.log('dnNo', dnNo); - const res: any = await http.post(url.auth.query.dnNo, { - factoryCode: session.factoryCode, - loginName: session.loginName, - dnNo, - }); - const dnNoList = res.data; - const DnLineList = []; - dnNoList.forEach((item: any) => { - const obj = { - value: item.dnItem, - lable: item.dnItem, - }; - DnLineList.push(obj); - }); - return { dnNoList, DnLineList }; - } - //俄罗斯 STO出库 查询库位 - LocList: any = []; - @MutationAction - async QueryLoc(sendSpot: any) { - const res: any = await http.post(url.auth.query.queryByFactoryCodeAndWorkAreaCode, { - factoryCode: session.factoryCode, - loginName: session.loginName, - workArea: session.workareaCode, - sendSpot, - }); - const LocList = []; - res.forEach((item: any) => { - const obj = { - value: item.locationCode, - lable: item.locationCode, - }; - LocList.push(obj); - }); - return { LocList }; - } - //扫描条码 - res: any = ''; - @MutationAction - async stoDnProdScan(list: any) { - const res: any = await http.post(url.auth.query.barcode, list); - //const SubCode = res.code; - return { res }; - } - //俄罗斯 出库提交 - SubCode: any = ''; - @MutationAction - async SubmitList(list: any) { - const res: any = await http.post(url.auth.query.factoryrussia, list); - const SubCode = res.code; - return { SubCode }; - } -} - -export default getModule(ReceiptModule); diff --git a/src/pages/raw/STO/FactorySTO-Storage/config.ts b/src/pages/raw/STO/FactorySTO-Storage/config.ts deleted file mode 100644 index 2df3db1..0000000 --- a/src/pages/raw/STO/FactorySTO-Storage/config.ts +++ /dev/null @@ -1,124 +0,0 @@ -/** - * 看单明细表格列 - */ -import vm from '@/main'; -export const headers = [ - { - label: vm.$t('message.Line'), - key: 'poLine', - }, - { - label: vm.$t('message.po_OddNumbers'), - key: 'poNo', - width: 350, - }, - { - label: vm.$t('message.Pi_materielNo'), - key: 'materialCode', - width: 350, - }, - { - label: vm.$t('message.CommissionedLocation'), - key: 'wlCode', - }, - { - label: vm.$t('message.product_Number'), - key: 'receiptAmount', - }, - { - label: vm.$t('message.Container'), - key: 'sn', //容器码 - width: 700, - }, -]; -export const Tabheaders = [ - { - label: vm.$t('message.STOInventoryOrderNo'), - key: 'stoNo', - width: 350, - }, - { - label: vm.$t('message.STOLine'), - key: 'stoItem', - width: 350, - }, - { - label: vm.$t('message.CommissionedLocation'), - key: 'wlCode', - width: 350, - }, - { - label: vm.$t('message.Container'), - key: 'barCode', - width: 350, - }, - { - label: vm.$t('message.product_Number'), - key: 'nowAmount', - }, -]; -export const ImportPOReceiveListHeaders = [ - { - label: vm.$t('message.po_OddNumbers'), - key: 'poNo', //po单号 - width: 350, - }, - { - label: vm.$t('message.Line'), - key: 'poLine', //行项目 - // width: 350, - }, - { - label: vm.$t('message.Pi_materielNo'), - key: 'materialCode', //物料号 - width: 350, - }, - { - label: vm.$t('message.CommissionedMaterielDesc'), - key: 'materialDesc', //物料描述 - width: 450, - }, - { - label: vm.$t('message.po_DemandQuantity'), - key: 'poAmount', //需求数量 - }, - { - label: vm.$t('message.Pi_unit'), - key: 'unit', //单位 - }, -]; -export const containerListHeaders = [ - { - label: vm.$t('message.Container'), - key: 'palletCode', //容器码 - width: 300, - }, - { - label: vm.$t('message.po_OddNumbers'), - key: 'poNo', //po单号 - width: 350, - }, - { - label: vm.$t('message.Line'), - key: 'poLine', //行项目 - // width: 350, - }, - { - label: vm.$t('message.Pi_materielNo'), - key: 'materialCode', //物料号 - width: 350, - }, - { - label: vm.$t('message.CommissionedMaterielDesc'), - key: 'materialDesc', //物料描述 - width: 450, - }, - { - label: vm.$t('message.po_DemandQuantity'), - key: 'poAmount', //需求数量 - }, - { - label: vm.$t('message.Pi_unit'), - key: 'unit', //单位 - }, -]; diff --git a/src/pages/raw/STO/FactorySTO-Storage/index.vue b/src/pages/raw/STO/FactorySTO-Storage/index.vue deleted file mode 100644 index 6c94bf3..0000000 --- a/src/pages/raw/STO/FactorySTO-Storage/index.vue +++ /dev/null @@ -1,612 +0,0 @@ - - - diff --git a/src/pages/raw/STO/FactorySTO-Storage/model.ts b/src/pages/raw/STO/FactorySTO-Storage/model.ts deleted file mode 100644 index 5e0c63e..0000000 --- a/src/pages/raw/STO/FactorySTO-Storage/model.ts +++ /dev/null @@ -1,82 +0,0 @@ -/* - * @Author: zhou lei - * @Date: 2022-09-28 10:26:36 - * @LastEditTime: 2023-05-22 17:35:34 - * @LastEditors: zhou lei - * @Description: - * @FilePath: \hgwms-factory-app\src\pages\raw\STO\FactorySTO-Storage\model.ts - * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 - */ -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: 'raw.STO.FactorySTO-Storage.index', -}) -export class ReceiptModule extends VuexModule { - //俄罗斯 STO入库 扫描DN单号 - dnNoList: any = []; - DnLineList: any = []; - @MutationAction - async QuerydnNo(dnNo: any) { - console.log('dnNo', dnNo); - const res: any = await http.post(url.auth.query.findStoDnReceiveInfo, { - factoryCode: session.factoryCode, - loginName: session.loginName, - dnNo, - }); - const dnNoList = res.data; - const DnLineList = []; - dnNoList.forEach((item: any) => { - const obj = { - value: item.dnItem, - lable: item.dnItem, - }; - DnLineList.push(obj); - }); - return { dnNoList, DnLineList }; - } - //俄罗斯 STO入库 查询库位 - LocList: any = []; - @MutationAction - async QueryLoc(sendSpot: any) { - const res: any = await http.post(url.auth.query.queryByFactoryCodeAndWorkAreaCode, { - factoryCode: session.factoryCode, - loginName: session.loginName, - workArea: session.workareaCode, - sendSpot, - }); - const LocList = []; - res.forEach((item: any) => { - const obj = { - value: item.locationCode, - lable: item.locationCode, - }; - LocList.push(obj); - }); - return { LocList }; - } - //扫描条码 - res: any = ''; - @MutationAction - async stoDnProdScan(list: any) { - const res: any = await http.post(url.auth.query.factorystoDnReceiveScan, list); - //const SubCode = res.code; - return { res }; - } - //俄罗斯 入库提交 - SubCode: any = ''; - @MutationAction - async SubmitList(list: any) { - const res: any = await http.post(url.auth.query.factorystoDnReceiveConfirm, list); - const SubCode = res.code; - return { SubCode }; - } -} - -export default getModule(ReceiptModule); diff --git a/src/utils/url.ts b/src/utils/url.ts index 46d5f48..ef199c0 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -34,11 +34,8 @@ export const url = { findStoDnReceiveInfo: '/wmspda/fg/findStoDnReceiveInfo/russia', queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', russia: '/wmspda/fg/stoDnConfirm/russia', - factoryrussia: '/wmspda/fg/stoDnConfirmCrossPlant/russia', stoDnReceiveConfirm: '/wmspda/fg/stoDnReceiveConfirm/russia', - factorystoDnReceiveConfirm: '/wmspda/fg/stoDnReceiveConfirmCrossPlant/russia', stoDnReceiveScan: '/wmspda/fg/stoDnReceiveScan/russia', - factorystoDnReceiveScan: '/wmspda/fg/stoDnReceiveScanIn/russia', }, systime: '/wmspda/auth/systime', userInfo: '/wmspda/auth/userinfo', @@ -189,6 +186,10 @@ export const url = { stoScan: '/wmspda/fg/stoOutbound/scan', stoConfirm: '/wmspda/fg/stoOutbound/confirm', stoPost: '/wmspda/fg/stoOutbound/post', + stoDetailQuery: '/wmspda/fg/stoOutbound/queryDetail', + pcListQuery: '/wmspda/fg/stoOutbound/queryPcNoList', + stoCancel: '/wmspda/fg/stoOutbound/cancel', + stoDelete: '/wmspda/fg/stoOutbound/delete', }, }, inbound: { @@ -221,6 +222,7 @@ export const url = { aggregateRussia: 'wmspda/sortscan/save/aggregate/russia', aggregate: '/wmspda/sortscan/save/aggregate', order: '/wmspda/sortscan/save/order', + pickVN: '/wmspda/sortscan/pickVN', orderRussia: 'wmspda/sortscan/save/order/russia', queryWlByMat: '/wmspda/sortscan/queryWlByMat', queryWlByMatBL: '/wmspda/sortscan/queryWlByMatBL',