diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index d1caf81..9283c41 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -524,5 +524,6 @@ export default { TargetMaterial: '目标物料', TargetMaterialdes: '目标物料描述', allocation: '调拨', + Relationship: 'BOM关系外生产扣料', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index dd33d05..d72a660 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -507,22 +507,23 @@ export default { CausesOfDefects: 'Causes of defects', PleaseOne: 'Please enter the responsible person', PleaseTwo: 'Please enter the cause of the defect', - rejectsOffline: 'Defective products offline', + rejectsOffline: 'NG Roll Off', ResponsibleProcess: 'Responsible process', PleaseThere: 'Please enter the responsible operation', - rawWasteJudgment: 'Waste judgment of raw materials', + rawWasteJudgment: 'Waste judgment of raw', reason1: 'reason', PleaseFour: 'Please enter the reason', ResponsibilityCategory: 'Responsibility category', Please_category: 'Please select the responsibility category', VirtualReplenishment: 'Virtual replenishment', VirtualInventory: 'Virtual inventory', - semifinishedWasteJudgment: 'Semi finished products are scrapped', + semifinishedWasteJudgment: 'Waste judgment of SFG', MaterialConversionL: 'Material conversion', OriginalMaterial: 'Original material', OriginalMaterialdes: 'Raw material des', TargetMaterial: 'Target material', TargetMaterialdes: 'Target material des', allocation: 'allocation', + Relationship: 'External Mat', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index f3cf818..5e32e91 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -524,5 +524,6 @@ export default { TargetMaterial: 'Целевой материалl', TargetMaterialdes: 'описание цели', allocation: 'переброска', + Relationship: 'производственные вычеты', }, }; diff --git a/src/pages.json b/src/pages.json index f19d517..0b6a4e2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1295,23 +1295,23 @@ "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } + }, + { + "path": "pages/raw/warehouse/MaterialConversion/index", + "style": { + "navigationBarTitleText": "物料转换", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/warehouse/Relationship/index", + "style": { + "navigationBarTitleText": "BOM关系外生产扣料", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } } - // { - // "path": "pages/raw/warehouse/MaterialConversion/index", - // "style": { - // "navigationBarTitleText": "物料转换", - // "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 - // } - // }, - // { - // "path": "pages/raw/warehouse/allocation/index", - // "style": { - // "navigationBarTitleText": "调拨", - // "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 - // } - // } ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/src/pages/raw/warehouse/MaterialConversion/index.vue b/src/pages/raw/warehouse/MaterialConversion/index.vue new file mode 100644 index 0000000..ad559ac --- /dev/null +++ b/src/pages/raw/warehouse/MaterialConversion/index.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/pages/raw/warehouse/MaterialConversion/model.ts b/src/pages/raw/warehouse/MaterialConversion/model.ts new file mode 100644 index 0000000..fe5433e --- /dev/null +++ b/src/pages/raw/warehouse/MaterialConversion/model.ts @@ -0,0 +1,86 @@ +/* + * @Author: zhou lei + * @Date: 2022-10-27 18:31:28 + * @LastEditTime: 2022-10-28 15:22:18 + * @LastEditors: zhou lei + * @Description: + * @FilePath: \hgwms-factory-app\src\pages\raw\warehouse\MaterialConversion\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.MaterialConversion', +}) +export class MaterialConversion extends VuexModule { + /** + * sap库存地点列表 + */ + cboPlaceList = []; + /** + * 隐藏看单号 + */ + poNo = ''; + /** + * 看单号查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + /** + * 看单明细 + */ + orderInInfoList: OrderInInfo[] = []; + code: any = ''; + /** + * 看单明细未通过明细 + */ + // orderInInfoListEx: OrderInInfo[] = []; + + /** + // * 查询看单号 + * @param poNo + */ + @MutationAction + async takeOrder(order3: any) { + try { + const records: any = await http.post(url.warehouse.rowTransfer.stoAdjusList, { + ...order3, + factoryCode: session.factoryCode, + loginName: session.loginName, + orderStatus: '0', + }); + const orderInInfoList = records.data.records; + const code = records.code; + console.log('获取来的数据', orderInInfoList); + return { orderInInfoList, 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.confirmMoveStoAdjus, list); + const code = records.code; + return { code }; + } +} + +export default getModule(MaterialConversion); diff --git a/src/pages/raw/warehouse/Relationship/index.vue b/src/pages/raw/warehouse/Relationship/index.vue new file mode 100644 index 0000000..d00f6c6 --- /dev/null +++ b/src/pages/raw/warehouse/Relationship/index.vue @@ -0,0 +1,259 @@ + + + + + diff --git a/src/pages/raw/warehouse/Relationship/model.ts b/src/pages/raw/warehouse/Relationship/model.ts new file mode 100644 index 0000000..f9f7e58 --- /dev/null +++ b/src/pages/raw/warehouse/Relationship/model.ts @@ -0,0 +1,86 @@ +/* + * @Author: zhou lei + * @Date: 2022-10-27 18:31:28 + * @LastEditTime: 2022-10-28 11:53:07 + * @LastEditors: zhou lei + * @Description: + * @FilePath: \hgwms-factory-app\src\pages\raw\warehouse\Relationship\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.Relationship', +}) +export class Relationship extends VuexModule { + /** + * sap库存地点列表 + */ + cboPlaceList = []; + /** + * 隐藏看单号 + */ + poNo = ''; + /** + * 看单号查询结果 + */ + orderInInfo: OrderInInfo = new OrderInInfo(); + /** + * 看单明细 + */ + orderInInfoList: OrderInInfo[] = []; + code: any = ''; + /** + * 看单明细未通过明细 + */ + // orderInInfoListEx: OrderInInfo[] = []; + + /** + // * 查询看单号 + * @param poNo + */ + @MutationAction + async takeOrder(params: any) { + try { + const records: any = await http.post(url.warehouse.rowTransfer.stoAdjusList, { + ...params, + factoryCode: session.factoryCode, + loginName: session.loginName, + orderStatus: '0', + }); + const orderInInfoList = records.data.records; + const code = records.code; + console.log('获取来的数据', orderInInfoList); + return { orderInInfoList, 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.confirmMoveStoAdjus, list); + const code = records.code; + return { code }; + } +} + +export default getModule(Relationship);