From 102b8066afb182aeac056fd0f6fb6b34fdc7ac69 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 9 Aug 2024 11:17:22 +0800
Subject: [PATCH] 2024/07/02

---
 .../modules/shipment/service/impl/ShipmentServiceImpl.java   | 3 ++-
 src/main/resources/mapper/shipment/ShipmentMapper.xml        | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentServiceImpl.java b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentServiceImpl.java
index e047348..aa8c70a 100644
--- a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentServiceImpl.java
+++ b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentServiceImpl.java
@@ -300,12 +300,13 @@ public class ShipmentServiceImpl extends ServiceImpl<ShipmentMapper, Shipment> i
             box.setSite(shipment.getSite());
             PartInformationVo part = shipmentRollMapper.queryPart(box);
             if (Objects.isNull(part)){
+//                continue;
                 throw new RuntimeException(detail.getPartNo()+"物料信息不存在!");
             }
             String customerPart = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00001");
             String[] customerPartNo = customerPart.split(",");
             if (customerPartNo.length < 3){
-                throw new RuntimeException("料号"+part+"的客户料号未维护或格式不正确!");
+                throw new RuntimeException("料号"+part.getPartNo()+"的客户料号未维护或格式不正确!");
             }
             String ACCPartNo = customerPartNo[0];
             String version = customerPartNo[1];
diff --git a/src/main/resources/mapper/shipment/ShipmentMapper.xml b/src/main/resources/mapper/shipment/ShipmentMapper.xml
index 4b5db0b..7658406 100644
--- a/src/main/resources/mapper/shipment/ShipmentMapper.xml
+++ b/src/main/resources/mapper/shipment/ShipmentMapper.xml
@@ -179,7 +179,7 @@
     </select>
 
     <select id="queryTransHeader" resultType="com.spring.modules.material.entity.TransHeader">
-        select TransNo,
+        select top 1 TransNo,
                Site,
                WarehouseID,
                TransDate,
@@ -210,7 +210,8 @@
                Status
         from TransHeader
         where Site = #{site}
-          and OrderRef1 = #{shipmentId} and Status = '已录入' and TransType_DB = 'SP'
+          and OrderRef1 = #{shipmentId} and Status = '已录入' and TransType_DB = 'SP' and LinkOrderFlag = 'Y'
+        order by TransDate desc
     </select>
 
     <select id="queryTransDetail" resultType="com.spring.modules.material.entity.TransDetail">