diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 7a8020b..c9f5236 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -533,5 +533,9 @@ export default { PleaseResponsibleArea: '请扫描责任区域', RegionName: '区域名称', Cannotvirtual: '不能大于虚拟库存', + SourceFactory: '源工厂', + Targetfactory: '目标工厂', + Transferissue: '调拨出库', + Transferreceipt: '调拨入库', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index fd4307c..6087c71 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -532,5 +532,9 @@ export default { Pleasedefects: 'Please scan for defects', PleaseResponsibleArea: 'Please scan the responsible area', Cannotvirtual: 'Cannot be greater than virtual inventory', + SourceFactory: 'Source Factory', + Targetfactory: 'Target factory', + Transferissue: 'Transfer issue', + Transferreceipt: 'Transfer receipt', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 53e37e2..ab650e0 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -532,5 +532,9 @@ export default { Pleasedefects: 'Ошибка сканирования', PleaseResponsibleArea: 'область ответственности сканирования', Cannotvirtual: 'не больше виртуальной памяти', + SourceFactory: 'завод - источник', + Targetfactory: 'объектный завод', + Transferissue: 'распределительный склад', + Transferreceipt: 'переброска на склад', }, }; diff --git a/src/pages.json b/src/pages.json index 0b6a4e2..9ca12c1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1311,6 +1311,22 @@ "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } + }, + { + "path": "pages/raw/STO/STO-OutboundTai/index", + "style": { + "navigationBarTitleText": "泰国STO调拨出库", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/STO/STO-StorageTai/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 8aaa948..015d6f2 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -165,7 +165,7 @@ export default class LoginPage extends BasePage { //修改俄罗斯版本号 this.Version = '1.1.7'; } else { - this.Version = '1.0.38'; + this.Version = '1.0.39'; } console.log('////', this.Version); } diff --git a/src/pages/raw/STO/STO-OutboundTai/index.vue b/src/pages/raw/STO/STO-OutboundTai/index.vue new file mode 100644 index 0000000..5ef5efb --- /dev/null +++ b/src/pages/raw/STO/STO-OutboundTai/index.vue @@ -0,0 +1,239 @@ + + + diff --git a/src/pages/raw/STO/STO-OutboundTai/model.ts b/src/pages/raw/STO/STO-OutboundTai/model.ts new file mode 100644 index 0000000..d978f8a --- /dev/null +++ b/src/pages/raw/STO/STO-OutboundTai/model.ts @@ -0,0 +1,108 @@ +/* + * @Author: zhou lei + * @Date: 2022-11-12 11:41:43 + * @LastEditTime: 2022-11-12 14:12:47 + * @LastEditors: zhou lei + * @Description:111 + * @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-OutboundTai\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 { page } from '@/utils/page'; +import { session } from '@/store/modules/session'; +import vm from '@/main'; + +class OrderInInfo { + checked?: boolean; + poNo?: string; + kw?: string; + userDefined10?: string; + orderStatus?: string; +} + +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'raw.warehouse.rowTransfer', +}) +export class rowTransfer extends VuexModule { + /** + * sap库存地点列表 + */ + cboPlaceList = []; + /** + * 隐藏看单号 + */ + poNo = ''; + /** + * 看单号查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + /** + * 看单明细 + */ + orderInInfoList: OrderInInfo[] = []; + materielList = []; + code = ''; + resdata: any = {}; + /** + * 看单明细未通过明细 + */ + // orderInInfoListEx: OrderInInfo[] = []; + + /** + // * 查询看单号 + * @param poNo + */ + @MutationAction + async takeYKOrder(order3: any) { + // console.log('获取来的数据咋啊啊啊'); + try { + const records: any = await http.post(url.warehouse.rowTransfer.findStoOutOrderInfo, { + ...order3, + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + console.log('records', records); + const code = records.code; + const orderInInfoList = records.data; + const materielList = orderInInfoList.map((item: any) => ({ + label: item.materialCode, + value: item.materialCode, + ...item, + })); + console.log('materielList', materielList); + return { orderInInfoList, materielList, code }; + } catch { + //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any }); + vm.customToast(vm.$t('message.Warehouse_Tip11') as any); + } + } + + @MutationAction + async onTakeoutConfirm(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.stoOutOrderDelivery, list); + const code = records.code; + return { code }; + } + //根据物料编码查询 + @MutationAction + async getproduct(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.getproduct, list); + const code = records.code; + const resdata = records.data; + return { code, resdata }; + } + //清除数据 + @MutationAction + async empty() { + const materielList = null; + return { materielList }; + } +} + +export default getModule(rowTransfer); diff --git a/src/pages/raw/STO/STO-StorageTai/index.vue b/src/pages/raw/STO/STO-StorageTai/index.vue new file mode 100644 index 0000000..414231a --- /dev/null +++ b/src/pages/raw/STO/STO-StorageTai/index.vue @@ -0,0 +1,236 @@ + + + diff --git a/src/pages/raw/STO/STO-StorageTai/model.ts b/src/pages/raw/STO/STO-StorageTai/model.ts new file mode 100644 index 0000000..49ed273 --- /dev/null +++ b/src/pages/raw/STO/STO-StorageTai/model.ts @@ -0,0 +1,108 @@ +/* + * @Author: zhou lei + * @Date: 2022-11-12 11:41:58 + * @LastEditTime: 2022-11-12 14:12:54 + * @LastEditors: zhou lei + * @Description: 111 + * @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-StorageTai\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 { page } from '@/utils/page'; +import { session } from '@/store/modules/session'; +import vm from '@/main'; + +class OrderInInfo { + checked?: boolean; + poNo?: string; + kw?: string; + userDefined10?: string; + orderStatus?: string; +} + +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'raw.warehouse.rowTransfer', +}) +export class rowTransfer extends VuexModule { + /** + * sap库存地点列表 + */ + cboPlaceList = []; + /** + * 隐藏看单号 + */ + poNo = ''; + /** + * 看单号查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + /** + * 看单明细 + */ + orderInInfoList: OrderInInfo[] = []; + materielList = []; + code = ''; + resdata: any = {}; + /** + * 看单明细未通过明细 + */ + // orderInInfoListEx: OrderInInfo[] = []; + + /** + // * 查询看单号 + * @param poNo + */ + @MutationAction + async takeYKOrder(order3: any) { + // console.log('获取来的数据咋啊啊啊'); + try { + const records: any = await http.post(url.warehouse.rowTransfer.findStoReceiveOrderInfo, { + ...order3, + factoryCode: session.factoryCode, + loginName: session.loginName, + }); + console.log('records', records); + const code = records.code; + const orderInInfoList = records.data.records; + const materielList = orderInInfoList.map((item: any) => ({ + label: item.materialCode, + value: item.materialCode, + ...item, + })); + console.log('materielList', materielList); + return { orderInInfoList, materielList, code }; + } catch { + //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any }); + vm.customToast(vm.$t('message.Warehouse_Tip11') as any); + } + } + + @MutationAction + async onTakeoutConfirm(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.stoOutOrderReceive, list); + const code = records.code; + return { code }; + } + //根据物料编码查询 + @MutationAction + async getproduct(list: any) { + const records: any = await http.post(url.warehouse.rowTransfer.getproduct, list); + const code = records.code; + const resdata = records.data; + return { code, resdata }; + } + //清除数据 + @MutationAction + async empty() { + const materielList = null; + return { materielList }; + } +} + +export default getModule(rowTransfer); diff --git a/src/pages/raw/warehouse/MaterialConversion/index.vue b/src/pages/raw/warehouse/MaterialConversion/index.vue index ad559ac..ddb3001 100644 --- a/src/pages/raw/warehouse/MaterialConversion/index.vue +++ b/src/pages/raw/warehouse/MaterialConversion/index.vue @@ -92,7 +92,7 @@ export default class KanDanHandOver extends BasePage { if (this.model.code == '1') { uni.showToast({ //icon: 'success', - title: this.$t('message.successful') as string, + title: this.model.records.msg, duration: 2000, image: '/static/icons/icon-51.png', }); diff --git a/src/pages/raw/warehouse/MaterialConversion/model.ts b/src/pages/raw/warehouse/MaterialConversion/model.ts index fe5433e..39bd923 100644 --- a/src/pages/raw/warehouse/MaterialConversion/model.ts +++ b/src/pages/raw/warehouse/MaterialConversion/model.ts @@ -1,7 +1,7 @@ /* * @Author: zhou lei * @Date: 2022-10-27 18:31:28 - * @LastEditTime: 2022-10-28 15:22:18 + * @LastEditTime: 2022-11-12 15:57:56 * @LastEditors: zhou lei * @Description: * @FilePath: \hgwms-factory-app\src\pages\raw\warehouse\MaterialConversion\model.ts @@ -56,6 +56,7 @@ export class MaterialConversion extends VuexModule { // * 查询看单号 * @param poNo */ + records: any = {}; @MutationAction async takeOrder(order3: any) { try { @@ -68,7 +69,7 @@ export class MaterialConversion extends VuexModule { const orderInInfoList = records.data.records; const code = records.code; console.log('获取来的数据', orderInInfoList); - return { orderInInfoList, code }; + return { orderInInfoList, code, records }; } catch { //uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any }); vm.customToast(vm.$t('message.Warehouse_Tip11') as any); diff --git a/src/utils/url.ts b/src/utils/url.ts index 444c0fc..a993b0e 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -251,6 +251,11 @@ export const url = { close: '/wmspda/fg/closeHandOrder', stoAdjusList: '/wmspda/fg/stoAdjusList', confirmMoveStoAdjus: '/wmspda/fg/confirmMoveStoAdjus', + getproduct: '/wmspda/product/semi-finished/get-product', + findStoOutOrderInfo: '/wmspda/fg/findStoOutOrderInfo/tha', + stoOutOrderDelivery: '/wmspda/fg/stoOutOrderDelivery/tha', + findStoReceiveOrderInfo: '/wmspda/fg/findStoReceiveOrderInfo/tha', + stoOutOrderReceive: '/wmspda/fg/stoOutOrderReceive/tha', }, container: { getRawStorageSnNew: '/wmspda/material/getRawStorageSnNew',