From d6a3865f2ad5906854e981b23941042ddd05be4e Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Mon, 9 Dec 2024 13:18:37 +0800
Subject: [PATCH] =?UTF-8?q?wms=E5=B7=A5=E5=BA=8F=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/domain/mes/ProRfidProcessDetail.java  |  9 ++++++
 .../ProRfidProcessDetailController.java       |  8 +++++
 .../mapper/ProRfidProcessDetailMapper.java    |  2 ++
 .../service/IProRfidProcessDetailService.java |  2 ++
 .../impl/ProRfidProcessDetailServiceImpl.java |  6 ++++
 .../mapper/mes/ProRfidProcessDetailMapper.xml | 31 +++++++++++++++++++
 .../impl/OdsProcureOrderServiceImpl.java      | 15 ++++++---
 7 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProRfidProcessDetail.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProRfidProcessDetail.java
index 80c66a47..e1933ca6 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProRfidProcessDetail.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProRfidProcessDetail.java
@@ -115,6 +115,15 @@ public class ProRfidProcessDetail extends BaseEntity {
 
 	@Excel(name = "班次")
 	private String shiftId;
+	private String recordCount;
+
+	public String getRecordCount() {
+		return recordCount;
+	}
+
+	public void setRecordCount(String recordCount) {
+		this.recordCount = recordCount;
+	}
 
 	public String getShiftId() {
 		return shiftId;
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java
index d252b597..98a5eb99 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java
@@ -45,6 +45,14 @@ public class ProRfidProcessDetailController extends BaseController {
         List<ProRfidProcessDetail> list = proRfidProcessDetailService.selectProRfidProcessDetailList(proRfidProcessDetail);
         return getDataTable(list);
     }
+    @RequiresPermissions("mes:detail:list")
+    @GetMapping("/listAll")
+    @Log(title = "rfid流程查看", businessType = BusinessType.QUERY)
+    public TableDataInfo listAll(ProRfidProcessDetail proRfidProcessDetail) {
+        startPage();
+        List<ProRfidProcessDetail> list = proRfidProcessDetailService.selectProRfidProcessDetailListAll(proRfidProcessDetail);
+        return getDataTable(list);
+    }
 
     /**
      * 导出生产rfid流程列表
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRfidProcessDetailMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRfidProcessDetailMapper.java
index 1229c2ca..769ddc4d 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRfidProcessDetailMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/ProRfidProcessDetailMapper.java
@@ -72,4 +72,6 @@ public interface ProRfidProcessDetailMapper {
     String getEquipStatus(String machineCode);
 
     String getEquipMode(String machineCode);
+
+    List<ProRfidProcessDetail> selectProRfidProcessDetailListAll(ProRfidProcessDetail proRfidProcessDetail);
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRfidProcessDetailService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRfidProcessDetailService.java
index 02ac6287..893a9cdf 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/IProRfidProcessDetailService.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IProRfidProcessDetailService.java
@@ -58,4 +58,6 @@ public interface IProRfidProcessDetailService {
      * @return 结果
      */
     public int deleteProRfidProcessDetailByRecordId(String recordId);
+
+    List<ProRfidProcessDetail> selectProRfidProcessDetailListAll(ProRfidProcessDetail proRfidProcessDetail);
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java
index 19ea127e..7cab3150 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java
@@ -94,4 +94,10 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer
     public int deleteProRfidProcessDetailByRecordId(String recordId) {
         return proRfidProcessDetailMapper.deleteProRfidProcessDetailByRecordId(recordId);
     }
+
+    @Override
+    @DS("#header.poolName")
+    public List<ProRfidProcessDetail> selectProRfidProcessDetailListAll(ProRfidProcessDetail proRfidProcessDetail) {
+        return proRfidProcessDetailMapper.selectProRfidProcessDetailListAll(proRfidProcessDetail);
+    }
 }
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml
index 3748daca..d4f2d89d 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/ProRfidProcessDetailMapper.xml
@@ -99,7 +99,38 @@
         </where>
         order by ppd.in_time desc
     </select>
+    <select id="selectProRfidProcessDetailListAll" parameterType="ProRfidProcessDetail"
+            resultType="com.op.system.api.domain.mes.ProRfidProcessDetail">
+        SELECT
+        ppd.workorder_code AS workorderCode,
+        ppd.factory_code AS factoryCode,
+        pow.product_code AS productCode,
+        pow.product_name AS productName,
+        pow.product_date AS productDate,
+        pow.shift_id AS shiftId,
+        COUNT ( * ) AS recordCount -- 增加记录数量的汇总
+        FROM
+        pro_rfid_process_detail ppd
+        LEFT JOIN pro_process pp ON pp.process_id = ppd.next_process_id
+        LEFT JOIN pro_process ppp ON ppp.process_id = ppd.now_process_id
+        LEFT JOIN pro_order_workorder pow ON pow.workorder_code = ppd.workorder_code
+
+        <where>
+            <if test="workorderCode != null  and workorderCode != ''">and ppd.workorder_code like concat('%',
+                #{workorderCode}, '%')
+            </if>
 
+        </where>
+        GROUP BY
+        ppd.workorder_code,
+        ppd.factory_code,
+        pow.product_code,
+        pow.product_name,
+        pow.product_date,
+        pow.shift_id
+        ORDER BY
+        MAX ( pow.product_date ) DESC;-- 根据产品日期排序
+    </select>
     <select id="selectProRfidProcessDetailByRecordId" parameterType="String" resultMap="ProRfidProcessDetailResult">
         <include refid="selectProRfidProcessDetailVo"/>
         where record_id = #{recordId}
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 ea9f1661..cc2bd7cf 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
@@ -1066,6 +1066,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     }
 
     @Override
+    @DS("#header.poolName")
     public void OutboundPostingSAPfc(List<OdsProcureOutOrder> orderList) {
 //		* 退料的移动类型为 262
 //				* 领料的移动类型为 261
@@ -1088,12 +1089,16 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
            sapBackflushMPQuery.setMatnr(odsProcureOutOrder.getMaterialCode());//物料号
              sapBackflushMPQuery.setQuantity(odsProcureOutOrder.getOutNumber().toString());  //数量
              sapBackflushMPQuery.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位
-              sapBackflushMPQuery.setBatch(odsProcureOutOrder.getUserDefined2());    //批号
+            sapBackflushMPQuery.setBatch(odsProcureOutOrder.getUserDefined1());    //批量
+           // sapBackflushMPQuery.setBatch(odsProcureOutOrder.getUserDefined1());
              sapMaterialPostingFCList.add(sapBackflushMPQuery);
             orderList2FC.add(odsProcureOutOrder);
         }
         if (sapMaterialPostingFCList.size() > 0) {
             //反冲过账
+            for (SapBackflushMPQuery    sapBackflushMPQuery:sapMaterialPostingFCList){
+                System.out.println(sapBackflushMPQuery.toString());
+            }
             R result2 = remoteSapService.sapBackflushMP(sapMaterialPostingFCList);//x
             int code = result2.getCode();
             OdsProcureOutOrder order = new OdsProcureOutOrder();
@@ -2936,8 +2941,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             //暂收状态的--其中备用字段1是用来保存暂收的凭证的，，
             Map paramMap=new HashMap<>();
             List<Map> mapList = new ArrayList<>();
-            paramMap.put("S_MBLNR",wmsRawOrderIn.getUserDefined1());
-            paramMap.put("S_MJAHR",wmsRawOrderIn.getUserDefined2());
+            paramMap.put("S_MBLNR",wmsRawOrderIn.getUserDefined1());//参考凭证的凭证号
+            paramMap.put("S_MJAHR",wmsRawOrderIn.getUserDefined2());//参考凭证会计年度
             paramMap.put("S_MATNR",wmsRawOrderIn.getMaterialCode());
             paramMap.put("incomeBatchNo",wmsRawOrderIn.getIncomeBatchNo());               //批次
             paramMap.put("ebelp",wmsRawOrderIn.getPoLine());
@@ -3003,7 +3008,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         String   result="操作成功";
         for (OdsProcureOrder    order:   odsProcureOrders){
             OdsProcureOrder odsProcureOrder  = order;
-            WmsRawOrderIn   wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdTWO(odsProcureOrder.getID());
+            WmsRawOrderIn   wmsRawOrderIn= wmsRawOrderInMapper.selectWmsRawOrderInByRawOrderInIdThress(odsProcureOrder.getID());
             //这个地方
             Map paramMap=new HashMap<>();
             List<Map> mapList = new ArrayList<>();
@@ -3014,7 +3019,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             paramMap.put("ebelp",wmsRawOrderIn.getPoLine());
             paramMap.put("poNo",wmsRawOrderIn.getPoNo());
             mapList.add(paramMap);
-            R result2 =   remoteSapService.sap105temporarilyCollected(mapList);
+            R result2 =   remoteSapService.handleUpdateSAP105(mapList);
             if (result2.getCode()==200){
                 Map map = new HashMap();
                 map = (Map) result2.getData();