diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 7118b39..9f3623a 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -482,5 +482,14 @@ export default { Box: '箱码', enterBox: '请输入箱码', ScanBoxCode: '请先扫描箱码', + STOTransfers: 'STO 调拨', + STOoutbound: 'STO 出库', + DNLine: 'DN行项目', + STOInventoryOrderNo: 'STO单号', + STOLine: 'STO行项目', + OutboundNum: '出库数量', + DeliveryLoc: '出库地点', + AllThem: '请全部出库', + submitted: '还有数据没提交 是否重新查询', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index a9f9e23..585e97d 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -482,5 +482,14 @@ export default { Box: 'Box Code', enterBox: 'Please enter the box code', ScanBoxCode: 'Please scan the box code first', + STOTransfers: 'STO Transfers', + STOoutbound: 'STO Outbound', + DNLine: 'DNRowItem', + STOInventoryOrderNo: 'STO Order', + STOLine: 'STORowItem', + OutboundNum: 'Outbound QTY', + DeliveryLoc: 'Delivery Loc', + AllThem: 'All of them, please', + submitted: 'There is data not submitted whether to re-query', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 64f61fe..15d2e8e 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -482,5 +482,14 @@ export default { Box: 'Ящик ярд', enterBox: 'Введите код ящика', ScanBoxCode: 'Сначала просканируйте ящики', + STOTransfers: 'STO отпускн', + STOoutbound: 'STO На продаж', + DNLine: 'DNСтрокаItem', + STOInventoryOrderNo: 'STO Заказ', + STOLine: 'STOСтрокаItem', + OutboundNum: 'На продаж количеств', + DeliveryLoc: 'Место выхода', + AllThem: 'Все из библиотеки, пожалуйста', + submitted: 'Есть также данные, которые не были представлены для повторного запроса', }, }; diff --git a/src/manifest.json b/src/manifest.json index f43ce9b..b20a234 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -42,7 +42,9 @@ ], "autoSdkPermissions" : true }, - "ios" : {}, + "ios" : { + "dSYMs" : false + }, /* ios打包配置 */ "sdkConfigs" : { "ad" : {} diff --git a/src/pages.json b/src/pages.json index 800503c..9f71bcc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1162,6 +1162,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/STO/index", + "style": { + "navigationBarTitleText": "STO调拨", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/STO/STO-Outbound/index", + "style": { + "navigationBarTitleText": "STO调拨出库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/demo/index", "style": { diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 1d43eb6..b828c55 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -158,7 +158,7 @@ export default class LoginPage extends BasePage { console.log('image', this.image); console.log('Version////', this.Version); } - Version = '1.0.34'; + Version = '1.1.1'; compareVersion(version1: any, version2: any) { //如果version1 大 会返回1 &&& 如果version2 大 会返回 -1 const newVersion1 = `${version1}`.split('.').length < 3 ? `${version1}`.concat('.0') : `${version1}`; diff --git a/src/pages/raw/STO/STO storage/config.ts b/src/pages/raw/STO/STO storage/config.ts new file mode 100644 index 0000000..b7db42f --- /dev/null +++ b/src/pages/raw/STO/STO storage/config.ts @@ -0,0 +1,119 @@ +/** + * 看单明细表格列 + */ +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.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/STO storage/index.vue b/src/pages/raw/STO/STO storage/index.vue new file mode 100644 index 0000000..7ed5d7c --- /dev/null +++ b/src/pages/raw/STO/STO storage/index.vue @@ -0,0 +1,542 @@ + + + diff --git a/src/pages/raw/STO/STO storage/model.ts b/src/pages/raw/STO/STO storage/model.ts new file mode 100644 index 0000000..b12cad3 --- /dev/null +++ b/src/pages/raw/STO/STO storage/model.ts @@ -0,0 +1,65 @@ +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.STO-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 }; + } + //俄罗斯 出库提交 + SubCode: any = ''; + @MutationAction + async SubmitList(list: any) { + const res: any = await http.post(url.auth.query.russia, list); + const SubCode = res.code; + return { SubCode }; + } +} + +export default getModule(ReceiptModule); diff --git a/src/pages/raw/STO/STO-Outbound/config.ts b/src/pages/raw/STO/STO-Outbound/config.ts new file mode 100644 index 0000000..b7db42f --- /dev/null +++ b/src/pages/raw/STO/STO-Outbound/config.ts @@ -0,0 +1,119 @@ +/** + * 看单明细表格列 + */ +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.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/STO-Outbound/index.vue b/src/pages/raw/STO/STO-Outbound/index.vue new file mode 100644 index 0000000..7ed5d7c --- /dev/null +++ b/src/pages/raw/STO/STO-Outbound/index.vue @@ -0,0 +1,542 @@ + + + diff --git a/src/pages/raw/STO/STO-Outbound/model.ts b/src/pages/raw/STO/STO-Outbound/model.ts new file mode 100644 index 0000000..b12cad3 --- /dev/null +++ b/src/pages/raw/STO/STO-Outbound/model.ts @@ -0,0 +1,65 @@ +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.STO-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 }; + } + //俄罗斯 出库提交 + SubCode: any = ''; + @MutationAction + async SubmitList(list: any) { + const res: any = await http.post(url.auth.query.russia, list); + const SubCode = res.code; + return { SubCode }; + } +} + +export default getModule(ReceiptModule); diff --git a/src/pages/raw/STO/index.vue b/src/pages/raw/STO/index.vue new file mode 100644 index 0000000..1263fc7 --- /dev/null +++ b/src/pages/raw/STO/index.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts b/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts index 26cf391..2f739aa 100644 --- a/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts +++ b/src/pages/raw/Semi-finished/Semi-finished-offline/model.ts @@ -42,15 +42,18 @@ export class PickingModule extends VuexModule { */ @MutationAction async queryReturningTypeList() { - const data: any = await http.get(url.inbound.finishProductOffline.kuwei, { - params: { - factoryCode: session.factoryCode, - loginName: session.loginName, - warehouseCode: session.warehouseCode, //仓库编码 - }, + const data: any = await http.post('wmspda/fg/queryByFactoryCodeAndWorkAreaCode', { + // params: { + // factoryCode: session.factoryCode, + // loginName: session.loginName, + // warehouseCode: session.warehouseCode, //仓库编码 + // }, + factoryCode: session.factoryCode, + loginName: session.loginName, + warehouseCode: session.warehouseCode, }); - console.log('data', data.data); - const returningTypeList = data.data.map((item: any) => ({ + console.log('data', data); + const returningTypeList = data.map((item: any) => ({ label: item.locationCode, value: item.locationCode + '(' + item.sendSpot + ')', })); diff --git a/src/utils/url.ts b/src/utils/url.ts index b2e22bd..1a1b67d 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -30,6 +30,9 @@ export const url = { lock: '/wmspda/bl/unlock', barcode: '/wmspda/bl/getOdsRawStorageSnNew', queryContainer: '/wmspda/material/orderin/queryContainer', + dnNo: '/wmspda/fg/findStoDnInfo/russia', + queryByFactoryCodeAndWorkAreaCode: '/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', + russia: '/wmspda/fg/stoDnConfirm/russia', }, systime: '/wmspda/auth/systime', userInfo: '/wmspda/auth/userinfo',