From ae1a59be613f945d2150069d93ff65317828ea87 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Tue, 20 Aug 2024 15:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/service/impl/OdsProcureOrderServiceImpl.java   | 8 ++++++--
 .../com/op/wms/service/impl/WmsProductPutServiceImpl.java | 1 +
 .../resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml  | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

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 e6dac788..bcf45168 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
@@ -810,6 +810,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 wmsOdsEmStorageNews.setWlCode(wmsRawOrderInSn.getWlCode());//库位编码
                 wmsOdsEmStorageNews.setWaCode(wmsRawOrderInSn.getWaCode());//库位编码
                 wmsOdsEmStorageNews.setMaterialCode(wmsRawOrderInSn.getMaterialCode());
+                wmsOdsEmStorageNews.setUserDefined2(formattedDate);//批次
                 wmsOdsEmStorageNews.setAmount(wmsRawOrderInSn.getAmount());
                 //添加库存--这个要有个判断有没有这个库存如果没有的话，就插入
                 WmsOdsMateStorageNews wmsOdsMateStorageNews = wmsOdsMateStorageNewsMapper.selectByWhCodeAndMate(wmsOdsEmStorageNews);
@@ -838,8 +839,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             }
 
 
-
-
         }else {////失败|
             result="暂收失败";
             order.setSapTempInfor(result2.getMsg());
@@ -1070,6 +1069,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         }
     }
 
+
+
+
+
+
     @Override
     public List<ProOrderWorkorder> getIdCardList(OdsProcureOrder odsProcureOrder) {
         List<OdsProcureOrder> orderList=   odsProcureOrderMapper.getIdCardList(odsProcureOrder);
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
index ae5ec4c3..0ff95244 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
@@ -1198,6 +1198,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNews.setProductName(wmsProductPut1.getProductName());
             wmsFpStorageNews.setFactoryCode(wmsProductPut.getFactoryCode());
             wmsFpStorageNews.setActiveFlag("1");
+            wmsFpStorageNews.setProductBatch(wmsProductPut1.getBatchNumber());
             wmsFpStorageNews.setUserDefined1(wmsProductPut1.getUnitOfMeasure());
             List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
             wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID());
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
index 1476172d..b56308ce 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
@@ -214,6 +214,7 @@
     <select id="selectByWhCodeAndMate" resultMap="WmsOdsMateStorageNewsResult">
 		select storage_id, wh_code, region_code, wa_code, storage_type, wl_code, material_code, material_desc, amount, storage_amount, occupy_amount, lpn, product_batch, receive_date, product_date, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code, wl_name from wms_ods_mate_storage_news
 		where	wh_code=#{whCode}	and wl_code=#{wlCode}   and wa_code=#{waCode}	and material_code=#{materialCode}
+        <if test="userDefined2 != null">and    user_defined2 = #{userDefined2}</if>
 	</select>
     <select id="selectBaseProductByCode" resultMap="WmsOdsMateStorageNewsResult">
 		select	DISTINCT 	material_desc,user_defined1