From 7009ae7bea1726e077d17388534eabcbe12fb8e1 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 18 Mar 2025 17:51:03 +0800 Subject: [PATCH] =?UTF-8?q?wms=E9=80=80=E8=B4=A7=E5=8D=95=E6=89=8B?= =?UTF-8?q?=E6=8C=81=E4=BF=AE=E6=94=B9-=E6=8F=90=E4=BA=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=85=A5=E5=8F=82=E5=8F=96=E6=B6=88=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E5=92=8C=E4=BB=93=E5=BA=93=EF=BC=8C=E5=90=8E=E7=AB=AF=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/mapper/OdsProcureOrderMapper.java | 2 ++ .../wms/service/impl/OdsProcureOrderServiceImpl.java | 11 +++++++++++ .../resources/mapper/wms/OdsProcureOrderMapper.xml | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index 277ea5c1a..a9a347632 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -123,4 +123,6 @@ public interface OdsProcureOrderMapper { public void updateodsProcureOrderCardTemNumber(OdsProcureOrder order); public void updateodsProcureOrderCardByu1(OdsProcureOrder order1); + + String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index e338f2bbf..b9a8c9f41 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -2852,6 +2852,17 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String createBy= odsProcureOutOrder.getCreateBy();//操作人 produceCode= order1.getProcureCode(); String userDefined6= odsProcureOutOrder.getUserDefined6();//标识卡 + //-这个地方的库区和仓库 + String order1MaterialCode= order1.getMaterialCode(); + String wcode= odsProcureOrderMapper.selectBaseProductAttached(order1MaterialCode); + if(wcode!=null&&wcode!=""){ + odsProcureOutOrder.setWaCode(wcode); + String whCode= baseProductAttachedMapper.selectBaseAreaListnew(wcode); + odsProcureOutOrder.setWhCode(whCode); + }else { + odsProcureOutOrder.setWaCode("0000"); + odsProcureOutOrder.setWhCode("WH02"); + } String waCode= odsProcureOutOrder.getWaCode(); String whCode= odsProcureOutOrder.getWhCode(); String wlCode= odsProcureOutOrder.getWlCode(); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 06cbf7246..1970c0f1c 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -943,5 +943,14 @@ WHERE ods_procure_order_card.User_Defined1= #{userDefined1} +