diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index d5e1be8..d34bc42 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -489,5 +489,8 @@ export default { totalNum: '累计数量', Operation: '操作人', StorageTime: '入库时间', + spareGoods: '备件发货', + matcode: '物料编码', + Quantity: '需求数量', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 1f07e24..79c53a0 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -494,5 +494,8 @@ export default { totalNum: 'total Num', Operation: 'Operation', StorageTime: 'Storage Time', + spareGoods: 'Spare deliver goods', + matcode: 'Mat code', + Quantity: 'Request', }, }; diff --git a/src/pages.json b/src/pages.json index 5cef026..5d70d83 100644 --- a/src/pages.json +++ b/src/pages.json @@ -493,7 +493,7 @@ { "path": "pages/raw/handover/feeding/Location", "style": { - "navigationBarTitleText": "补料明细", + "navigationBarTitleText": "补料", "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } @@ -842,10 +842,26 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/product/outbound/SpareDeliverGoods/detail", + "style": { + "navigationBarTitleText": "备件发货明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/ingoods/SpareInbound/Inbound/Local-details", "style": { - "navigationBarTitleText": "备件明细", + "navigationBarTitleText": "备件入库明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/raw/handover/feeding/RUS-Location", + "style": { + "navigationBarTitleText": "俄罗斯补料", "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } diff --git a/src/pages/product/outbound/SpareDeliverGoods/config.ts b/src/pages/product/outbound/SpareDeliverGoods/config.ts index fa4b24d..8c92d5a 100644 --- a/src/pages/product/outbound/SpareDeliverGoods/config.ts +++ b/src/pages/product/outbound/SpareDeliverGoods/config.ts @@ -4,18 +4,8 @@ import vm from '@/main'; export const headers = [ { - label: vm.$t('message.product_barCode'), - key: 'barcode', - width: 300, - }, - { - label: vm.$t('message.product_FGCode'), - key: 'productCode', - width: 300, - }, - { - label: vm.$t('message.product_FGDes'), - key: 'productDescZh', + label: vm.$t('message.dn_OddNumbers'), + key: 'order1', width: 300, }, { @@ -23,4 +13,34 @@ export const headers = [ key: 'order2', width: 300, }, + { + label: vm.$t('message.matcode'), + key: 'productCode', + width: 300, + }, + { + label: vm.$t('message.po_MaterielDes'), + key: 'productDescZh', + width: 300, + }, + { + label: vm.$t('message.CommissionedLocation'), + key: 'locCode', + width: 300, + }, + { + label: vm.$t('message.CommissionedGoOutNumber'), + key: 'qty', + width: 300, + }, + { + label: vm.$t('message.Operation'), + key: 'createdBy', + width: 300, + }, + { + label: vm.$t('message.operatingTime'), + key: 'createdDate', + width: 300, + }, ]; diff --git a/src/pages/product/outbound/SpareDeliverGoods/detail.vue b/src/pages/product/outbound/SpareDeliverGoods/detail.vue new file mode 100644 index 0000000..80b550e --- /dev/null +++ b/src/pages/product/outbound/SpareDeliverGoods/detail.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/src/pages/product/outbound/SpareDeliverGoods/index.vue b/src/pages/product/outbound/SpareDeliverGoods/index.vue index 084f1f4..2345145 100644 --- a/src/pages/product/outbound/SpareDeliverGoods/index.vue +++ b/src/pages/product/outbound/SpareDeliverGoods/index.vue @@ -4,66 +4,53 @@ - {{ $t('message.deliver') }} + {{ $t('message.spareGoods') }} - + {{ $t('message.Query') }} - - - + + + - - - - - - - - + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - {{ $t('message.detailed') }} - {{ $t('message.Posting') }} + {{ $t('message.po_Submit') }} @@ -71,12 +58,9 @@ diff --git a/src/pages/product/outbound/SpareDeliverGoods/model.ts b/src/pages/product/outbound/SpareDeliverGoods/model.ts index c49d00a..518a936 100644 --- a/src/pages/product/outbound/SpareDeliverGoods/model.ts +++ b/src/pages/product/outbound/SpareDeliverGoods/model.ts @@ -1,231 +1,74 @@ -import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +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'; -// import vm from '@/main'; - -class OrderInInfo { - stoAmount?: 0; - stoNo?: string; //STO采购单号 - orderAmount?: string; //单据总数 - Allocated?: string; //已分配 - Unallocated?: string; //未分配 -} - @Module({ namespaced: true, dynamic: true, store, name: 'product.outbound.SpareDeliverGoods', }) -export class ReturningModule extends VuexModule { - /** - * 月台列表 - */ - returningTypeList: any[] = []; - PostingCode: any = ''; - /** - * 物料列表 - */ - materielList: any[] = []; - - //条码扫描的返回的结果 - oneMaterielDetail: any = {}; - /** - * 订单号查询结果 - */ - orderInInfo: OrderInInfo = new OrderInInfo(); - resCode: any = ''; - //记账按钮的code码 - code = ''; - DNcode: any = ''; - /** - * 查询月台列表 - */ +export class ReturnModule extends VuexModule { + materielList: any = []; //备件发货 物料列表 + beijianList: any = []; //备件发货 数据列表 + findSpareInfoByDNCode: any = ''; //备件发货 查询单号接口code返回值 @MutationAction - async queryReturningTypeList() { - const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, { + async queryReturningTypeList(nxOutCode: string) { + const res: any = await http.post(url.outbound.stoOutbound.findSpareInfoByDN, { factoryCode: session.factoryCode, - whCode: session.warehouseCode, loginName: session.loginName, - }); - const returningTypeList = list.map((item: any) => ({ - label: item.dockName, - value: item.dockCode, - })); - return { returningTypeList }; - } - - /** - * 查询订单号 - * @param orderNo - */ - @MutationAction - async queryOrderInInfo(nxOutCode: string) { - const result = await http.post(url.outbound.stoOutbound.info, { nxOutCode, - deleteFlag: 2, - finalState: 3, - loginName: session.loginName, }); - let stoAmount = 0; - result.data.records.forEach((item: any) => { - stoAmount += item.orderAmount; - }); - const materielList = result.data.records.map((item: any) => ({ + const findSpareInfoByDNCode = res.code; + const beijianList = res.data; + const materielList = res.data.map((item: any) => ({ label: item.materialCode, - value: item.stoItem, - ...item, - })); - console.log('materielList', materielList); - if (result.data.records[0]) { - result.data.records[0].stoAmount = stoAmount; - } - const orderInInfo = result.data.records[0] || {}; - return { orderInInfo, materielList }; - } - /** - * 查询订单号 - */ - @MutationAction - async findProdInfoByDN(nxOutCode: string) { - const result: any = await http.post(url.outbound.stoOutbound.findProdInfoByDN, { - nxOutCode, - loginName: session.loginName, - factoryCode: session.factoryCode, - }); - console.log('resule>>>>>>>>>>>>>>>>>>>>>>>', result); - let stoAmount = 0; - const DNcode = result.code; - result.data.forEach((item: any) => { - stoAmount += item.orderAmount; - }); - const materielList = result.data.map((item: any) => ({ value: item.materialCode, - rowItem: item.rowItem, - label: item.rowItem + '(' + item.materialCode + ')', - ...item, })); - console.log('materielList', materielList); - if (result.data[0]) { - result.data[0].stoAmount = stoAmount; - } - const orderInInfo = result.data[0] || {}; - return { orderInInfo, materielList, DNcode }; - } - //退扫 - @MutationAction - async delCode(params: any = {}) { - const res: any = await http.post(url.outbound.stoOutbound.del, params); - const resCode = res.code; - return { resCode }; - } - /** - * 扫条码 - */ - @Action - async tluSubmit(list: any[]) { - const obj = { - barcode: list[0].barCode, - loginName: session.loginName, - }; - let oneMaterielDetail: any = {}; - const { data }: any = await http.post(url.outbound.stoOutbound.checkScan, obj); - console.log('shneme a ', data.records); - oneMaterielDetail = data.records[0]; - data.records[0].materialCode = list[0].productCode; - data.records[0].materialDesc = list[0].productDescZh; - console.log('aaaaa', oneMaterielDetail); - return oneMaterielDetail; - } - /** - * 扫条码 - */ - @Action - async getMaterialByCode(list: any = {}) { - let oneMaterielDetail: any = {}; - const { data }: any = await http.post(url.outbound.stoOutbound.getMaterialByCode, list); - oneMaterielDetail = data.records[0]; - return oneMaterielDetail; - } - /** - * 确认按钮 - * @param orderNo - */ - @MutationAction - async confirm(list: any[]) { - const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list); - console.log('res数据', data, code); - // if (code == '1') { - // uni.showToast({ icon: 'success', title: msg }); - // } else { - // uni.showToast({ icon: 'none', title: msg }); - // } - const materielList: any = []; - return { code, materielList }; - } - /** - * 确认按钮 - * @param orderNo - */ - @MutationAction - async confirmMove(list: any) { - const res: any = await http.post(url.outbound.stoOutbound.Bookkeeping, list); - console.log('res数据', res); - const code = res.code; - // if (code == '1') { - // uni.showToast({ icon: 'success', title: msg }); - // } else { - // uni.showToast({ icon: 'none', title: msg }); - // } - const materielList: any = []; - return { code, materielList }; - } - /** - * 查询详细 - * @param orderNo - */ - @MutationAction - async queryDetailed(order1: string) { - const { code, data } = await http.post(url.outbound.stoOutbound.getDetailByorderNo, { - order1, - loginName: session.loginName, - factoryCode: session.factoryCode, - }); - console.log('res数据', data, code); - const materielList = data; - console.log('>>>>>>>', materielList); - return { code, materielList }; + return { beijianList, materielList, findSpareInfoByDNCode }; } - //退扫接口 + wlcodeList: any = []; @MutationAction - async BackSweep(params: any) { - const res: any = await http.post(url.outbound.stoOutbound.scanBarcodeDN, params); - console.log('res>>>>>>>>>>>>>>>>>>>>>>>>.', res); - const code = res.code; - return { code }; + async querywocodeList() { + const data: any = await http.get(url.inbound.finishProductOffline.kuwei, { + params: { + factoryCode: session.factoryCode, + loginName: session.loginName, + warehouseCode: session.warehouseCode, + }, + }); + const wlcodeList = data.data.map((item: any) => ({ + label: item.locationCode, + value: item.locationCode + '(' + item.sendSpot + ')', + })); + return { wlcodeList }; } - //退扫查询接口 + + submitCode: any = ''; @MutationAction - async queryAmount(params: any) { - const res: any = await http.post(url.outbound.stoOutbound.queryAmount, params); - console.log('退扫>>>>>>>>>>>>>>>>>>>>>>>>.', res); - return {}; + async submitbj(params: any) { + const res: any = await http.post(url.outbound.stoOutbound.confirmSpareDeliver, { + factoryCode: session.factoryCode, + loginName: session.loginName, + ...params, + }); + const submitCode = res.code; + return { submitCode }; } - //过账 + + detailList: any = []; @MutationAction - async Posting(params: any) { - const res: any = await http.post(url.outbound.stoOutbound.Posting, params); - const PostingCode = res.code; - return { PostingCode }; - } - @MutationAction - async empty() { - const orderInInfo = {}; - return { orderInInfo }; + async queryDetailed(order1: any) { + const res: any = await http.post(url.outbound.stoOutbound.querySpareListInfoByDnNo, { + factoryCode: session.factoryCode, + loginName: session.loginName, + order1, + }); + const detailList = res.data; + return { detailList }; } } -export default getModule(ReturningModule); +export default getModule(ReturnModule); diff --git a/src/pages/product/outbound/stoOutbound/detail.vue b/src/pages/product/outbound/stoOutbound/detail.vue index 8056241..f4bd7df 100644 --- a/src/pages/product/outbound/stoOutbound/detail.vue +++ b/src/pages/product/outbound/stoOutbound/detail.vue @@ -14,41 +14,8 @@
{{ $t('message.po_Total') }} {{ model.materielList.length }} {{ $t('message.po_Records') }} - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - @@ -61,42 +28,8 @@ import { headers } from './config'; @Component export default class RawReceiptDetail extends BasePage { - /** - * 页面Module - */ model = model; - - /** - * 库位 - */ - locationCode = ''; - - /** - * 表头 - */ headers = headers; - - /** - * 逐条修改 - */ - // changeLocation() { - // if (!this.model.hasChecked) { - // uni.showToast({ - // icon: 'none', - // title: '请选择要修改的行', - // }); - // return; - // } - // this.model.changeOrderInLocation(this.locationCode); - // } - - /** - * 提交 - */ - // async onSubmit() { - // await this.model.submitOrderInEnter(); - // this.locationCode = ''; - // } } diff --git a/src/pages/raw/handover/feeding/RUS-Location.vue b/src/pages/raw/handover/feeding/RUS-Location.vue new file mode 100644 index 0000000..92f41dd --- /dev/null +++ b/src/pages/raw/handover/feeding/RUS-Location.vue @@ -0,0 +1,653 @@ + + + + + diff --git a/src/pages/raw/handover/feeding/model.ts b/src/pages/raw/handover/feeding/model.ts index 3032c8d..86ae063 100644 --- a/src/pages/raw/handover/feeding/model.ts +++ b/src/pages/raw/handover/feeding/model.ts @@ -207,6 +207,17 @@ export class FeedingModule extends VuexModule { console.log(res); return {}; } + //俄罗斯补料扫描容器码 + @MutationAction + async searchBarcode(barcode: any) { + const res: any = await http.post(url.auth.query.barcode, { + factoryCode: session.factoryCode, + loginName: session.loginName, + barcode, + }); + console.log('res', res); + return {}; + } @Action({ commit: 'updateCheckedOrderInInfoListKw' }) async queryByFactoryCodeAndWorkAreaCode(content: any) { const res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content); diff --git a/src/utils/page.ts b/src/utils/page.ts index 35882ec..73c8a83 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -33,6 +33,9 @@ export const page = { Back: '/pages/product/outbound/stoOutbound/Back', stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail', }, + SpareDeliverGoods: { + detail: '/pages/product/outbound/SpareDeliverGoods/detail', + }, warehouse: { index: '/pages/product/warehouse/index', wholeTransfer: { diff --git a/src/utils/url.ts b/src/utils/url.ts index fb10ac1..ebf51b9 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -28,6 +28,7 @@ export const url = { queryAppendDetail: '/wmspda/bl/queryAppendDetail', createAppendList: '/wmspda/bl/createAppendList', lock: '/wmspda/bl/unlock', + barcode: '/wmspda/bl/getOdsRawStorageSnNew', }, systime: '/wmspda/auth/systime', userInfo: '/wmspda/auth/userinfo', @@ -131,6 +132,8 @@ export const url = { info: '/wmspda/material/orderout/queryStoPlan', findProdInfoByDN: '/wmspda/fg/findProdInfoByDN', yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse', + findSpareInfoByDN: '/wmspda/fg/findSpareInfoByDN', + confirmSpareDeliver: '/wmspda/fg/confirmSpareDeliver', Bookkeeping: '/wmspda/fg/scanBarcodeDN', close: '/wmspda/material/outsourcing/close', // Bookkeeping: '/wmspda/fg/confirmMove', @@ -138,6 +141,7 @@ export const url = { del: '/wmspda/fg/scanBarcodeDN/del', getMaterialByCode: '/wmspda/fg/getMaterialByCode', queryOrder: '/wmspda/material/outsourcing/into/queryOrder', + querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo', subcDnInfo: '/wmspda/material/orderin/subcDnInfo', submit: '/wmspda/material/outsourcing/into/materialComplete', materialComplete: '/wmspda/material/outsourcing/materialComplete', diff --git a/tsconfig.json b/tsconfig.json index 1ac7194..d8d2329 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,34 +8,18 @@ "moduleResolution": "node", "esModuleInterop": true, "allowSyntheticDefaultImports": true, - "experimentalDecorators":true, + "experimentalDecorators": true, "sourceMap": true, "skipLibCheck": true, "baseUrl": ".", // 在使用typescript的时候，在vue或react、node中报以上错误，是JSX 元素隐式具有类型 "any"，因为不存在全局类型 "JSX.Element" "suppressImplicitAnyIndexErrors": true, "noImplicitAny": false, // 是否在表达式和声明上有隐含的any类型时报错 - "types": [ - "webpack-env", - "@dcloudio/types", - "miniprogram-api-typings", - "mini-types", - ], + "types": ["webpack-env", "@dcloudio/types", "miniprogram-api-typings", "mini-types"], "paths": { - "@/*": [ - "./src/*" - ] + "@/*": ["./src/*"] }, - "lib": [ - "esnext", - "dom", - "dom.iterable", - "scripthost" - ] + "lib": ["esnext", "dom", "dom.iterable", "scripthost"] }, - "exclude": [ - "node_modules", - "unpackage", - "src/**/*.nvue" - ] + "exclude": ["node_modules", "unpackage", "src/**/*.nvue"] }