From e4439acdc4d44aaf456339d723152fa5ae4ddf52 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Mon, 26 Jan 2026 15:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=86=E6=96=99=E8=BD=AC?= =?UTF-8?q?=E5=82=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 10 +- src/pages/wms/Raw/ProductionREQ/index.vue | 117 ++++++----- src/pages/wms/Raw/ProductionREQ/model.ts | 6 + src/pages/wms/Raw/ProductionREQ2/index.vue | 213 +++++++++++++++++++++ src/pages/wms/Raw/ProductionREQ2/model.ts | 14 ++ src/utils/url.ts | 14 +- 6 files changed, 326 insertions(+), 48 deletions(-) create mode 100644 src/pages/wms/Raw/ProductionREQ2/index.vue create mode 100644 src/pages/wms/Raw/ProductionREQ2/model.ts diff --git a/src/pages.json b/src/pages.json index 223df6e..df1719f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -719,9 +719,17 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/ProductionREQ2/index", + "style": { + "navigationBarTitleText": "领料转储", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } - + ], "globalStyle": { diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue index d39ec34..aec11bf 100644 --- a/src/pages/wms/Raw/ProductionREQ/index.vue +++ b/src/pages/wms/Raw/ProductionREQ/index.vue @@ -23,52 +23,27 @@ - - - - - - - 领料单: - {{ item.produceCode }} + + + + + + + + + + - - 物料编码: - {{ item.handlematerialCode }} - - - 物料名称: - {{ item.materialDesc }} - - - - 应出: - {{ item.planNumber }} - - - 已出: - {{ item.outNumber }} - - - - - 未出: - {{ parseFloat(item.planNumber) - parseFloat(item.outNumber) }} - - - 单位: - {{ item.unit }} - - - - 是否过账: - - - - 物料凭证: - {{ item.userDefined9 ? item.userDefined9 : '无' }} + + + + + + + + @@ -106,7 +81,7 @@ - 确认出库 + 确认出库 @@ -121,8 +96,10 @@ import { Component } from 'vue-property-decorator'; import { BasePage } from '@/components/base/page'; import jPicker from '@/components/J-Picker/jPicker.vue'; -import model from './model'; +import model, {submitReverseMaterialList} from './model'; import { session } from '@/store/modules/session'; +import LjListRow from "@/components/lanju/lj-list-row/index.vue"; +import {submitTransferMaterialList} from "@/pages/wms/Raw/ProductionREQ2/model"; interface OptionType { label: string; value: string; @@ -130,6 +107,7 @@ interface OptionType { //import { session } from '@/store/modules/session'; @Component({ components: { + LjListRow, jPicker, }, }) @@ -376,6 +354,55 @@ export default class ProductionREQ extends BasePage { //this.getlist(); } } + + async onSubmitV2() { + if (this.orderNo == '' || this.orderNo.length == 0) { + (this.$refs.uToast as any).show({ + title: '请输入领料单号', + }); + return; + } + + const list = [] + + //遍历列表 + //获取需要过账列表与出账列表 + for (const item of this.materilist){ + if (item.isPost + "" === "1"){ + list.push(item) + continue; + } + if ( item.qty && parseInt(item.qty) > 0){ + list.push(item) + } + } + + const data = { + createBy:session.userName, + factoryCode:session.FactoryCode, + orderList:list, + } + + submitReverseMaterialList(data).then(res=>{ + if (res.code === 200){ + uni.showToast({ + title: '操作成功！', + mask:true + }) + + }else { + uni.showToast({ + title: '操作失败！', + mask:true + }) + } + setTimeout(()=>{ + this.query() + },1500) + }) + + } + mepty() { this.list = []; this.materilist = []; diff --git a/src/pages/wms/Raw/ProductionREQ/model.ts b/src/pages/wms/Raw/ProductionREQ/model.ts index e6e3e87..54aadb5 100644 --- a/src/pages/wms/Raw/ProductionREQ/model.ts +++ b/src/pages/wms/Raw/ProductionREQ/model.ts @@ -108,3 +108,9 @@ export class ProductionREQ extends VuexModule { } export default getModule(ProductionREQ); + + +export function submitReverseMaterialList(data: any): Promise { + return http.post(url.lanjuwms.raw.ProductionREQ.submitReverseMaterialList, data); +} + diff --git a/src/pages/wms/Raw/ProductionREQ2/index.vue b/src/pages/wms/Raw/ProductionREQ2/index.vue new file mode 100644 index 0000000..b904b6c --- /dev/null +++ b/src/pages/wms/Raw/ProductionREQ2/index.vue @@ -0,0 +1,213 @@ + + + + + \ No newline at end of file diff --git a/src/pages/wms/Raw/ProductionREQ2/model.ts b/src/pages/wms/Raw/ProductionREQ2/model.ts new file mode 100644 index 0000000..9f67b98 --- /dev/null +++ b/src/pages/wms/Raw/ProductionREQ2/model.ts @@ -0,0 +1,14 @@ +import http from '@/utils/request'; +import { url } from '@/utils/url'; + +export function getBatchProductionMaterialList(data: any): Promise { + return http.get(url.lanjuwms.raw.ProductionREQ2.getBatchProductionMaterialList, { + params: data, + }); +} + + +export function submitTransferMaterialList(data: any): Promise { + return http.post(url.lanjuwms.raw.ProductionREQ2.submitTransferMaterialList, data); +} + diff --git a/src/utils/url.ts b/src/utils/url.ts index 8f9957c..e87cefc 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -1,12 +1,17 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用 -// const qianzhuione = '/prod-api'; +let qianzhuione = '/prod-api'; +if (process.env.NODE_ENV === 'development') { + console.log('开发环境'); + qianzhuione = '/dev-api'; +} + export const url = { wmspda: { system: { test: '/wmspda/system/test', login: qianzhuione + '/auth/login', getInfo: qianzhuione + '/system/user/mobileGetInfo', + getLastApkVersion: qianzhuione + '/system/apkFile/getLastApkVersion' }, }, sys: { @@ -173,6 +178,11 @@ export const url = { ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionSC', NewConMaterialOutSC: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSC', NewConMaterialOutSCNew: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSCNew', + submitReverseMaterialList: qianzhuione + '/wms/rawMaterialOut/submitReverseList', + }, + ProductionREQ2: { + getBatchProductionMaterialList: qianzhuione + '/wms/rawMaterialOut/transferMaterialList', + submitTransferMaterialList: qianzhuione + '/wms/rawMaterialOut/submitTransferList', }, ReturnMaterials: { listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC',