From 48c6ee4db122f2b864a15f63451fbf8f6f696008 Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 19 Sep 2024 17:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E8=B4=A6=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/mapper/OdsProcureOutOrderMapper.java    |  2 ++
 .../service/impl/OdsProcureOrderServiceImpl.java   |  7 +++++++
 .../impl/OdsProcureOutOrderServiceImpl.java        | 13 +++++++++++--
 .../mapper/wms/OdsProcureOutOrderMapper.xml        | 14 ++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java
index d5f90ef5..3f6c8f2d 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java
@@ -129,4 +129,6 @@ public interface OdsProcureOutOrderMapper {
     public  List<OdsProcureOutOrder> selectWmsOdsProcureOutOrderByOrderStatus(OdsProcureOutOrder order);
 
     String selectMesReportWorkConsume(OdsProcureOutOrder order);
+
+    List<OdsProcureOutOrder> selectMesReportWorkConsumeFC(@Param("userDefined4")String userDefined4,@Param("materialCode")String materialCode);
 }
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 65e9f58e..f4df823a 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
@@ -1262,6 +1262,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         paramMap.put("MATNR",order.getMaterialCode());
         paramMap.put("WERKS",order.getSiteCode());
         paramMap.put("QUANTITY",amount.toString());
+        paramMap.put("P_LFSNR",order.getUserDefined5());
         mapList.add(paramMap);
         R result2 =   remoteSapService.temporarilyCollected(mapList);
         int code = result2.getCode();
@@ -1432,6 +1433,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         mapList.add(paramMap);
         R result2 =   remoteSapService.sap105temporarilyCollected(mapList);
         if (result2.getCode()==200){
+            Map map = new HashMap();
+            map = (Map) result2.getData();
+            String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT");
+            String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR");
             //成功了--成功了,根据
             WmsRawOrderInSn wmsRawOrderInSn=new WmsRawOrderInSn();
             wmsRawOrderInSn.setUserDefined5(wmsRawOrderIn.getDnNo());
@@ -1459,6 +1464,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             wmsRawOrderIn.setOrderStatus("1");
             wmsRawOrderIn.setAccountingTime(new Date());
             wmsRawOrderIn.setAccountingMessage(result2.getMsg());
+            wmsRawOrderIn.setUserDefined4(MATERIALDOCUMENT);
+            wmsRawOrderIn.setUserDefined5(MATDOCUMENTYEAR);
             wmsRawOrderInMapper.updateWmsRawOrderIn(wmsRawOrderIn);
             return result2.getMsg();
         }else {
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
index f79579c4..e0b42ebd 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java
@@ -141,9 +141,18 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
         orderList) {
             if (order.getUserDefined4().length()>10){
              String tem=   odsProcureOutOrderMapper.selectMesReportWorkConsume(order);
-             order.setBGNumber(new BigDecimal(tem));
-            }else {
+             if(tem==null){
+                 order.setBGNumber(new BigDecimal("0"));
+             }else {
+                 order.setBGNumber(new BigDecimal(tem));
+             }
 
+            }else {
+                    //这个反冲的
+                List<OdsProcureOutOrder>    odsProcureOutOrderList=odsProcureOutOrderMapper.selectMesReportWorkConsumeFC(order.getUserDefined4(),order.getMaterialCode());
+                    if (odsProcureOutOrderList.size()>0){
+                        order.setBGNumber( odsProcureOutOrderList.get(0).getPlanNumber());
+                    }
             }
         }
 
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
index 9947a776..5c987ea6 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
@@ -1137,4 +1137,18 @@
 			workorder_code =#{userDefined4}
 		  AND material_code = #{materialCode}
 	</select>
+	<select id="selectMesReportWorkConsumeFC"	resultMap="OdsProcureOutOrderResult">
+		select
+			sum(mco.quantity) Plan_Number
+		from pro_order_workorder ow
+				 left join mes_prepare mp on ow.workorder_code = mp.workorder_code
+				 left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id
+				 left join	mes_report_work_consume	mco	ON	mpd.parent_work_order=mco.parent_order	AND	mpd.material_code=mco.material_code
+		where ow.product_date =#{userDefined4}	AND	mpd.material_code=#{materialCode}
+		  and mpd.recoil = 'X' and mp.del_flag = '0' and mpd.del_flag = '0'
+		GROUP BY mpd.material_code,
+				 mpd.unit,
+				 mpd.factory_code,mpd.recoil
+		order by mpd.material_code
+	</select>
 </mapper>