From b5de25edc97a9c37f10559b45299342fdbe43996 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Thu, 27 Jun 2024 16:18:18 +0800
Subject: [PATCH] 2024/06/27

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

diff --git a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
index 5b8e3ed..ac9a7f7 100644
--- a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
+++ b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java
@@ -48,10 +48,11 @@ public class ShipmentRollServiceImpl extends ServiceImpl<ShipmentRollMapper, Shi
     public void insertShipmentRoll(ShipmentRollVo shipmentRollVo) {
         // 获取 卷号对应 partNo
         SoFinalRollData rollData = productionStockMapper.getRollBySysBatch(shipmentRollVo.getSite(),shipmentRollVo.getRollNo());;
+        log.info("卷:{}",rollData);
         if (Objects.isNull(rollData)) {
             throw new RuntimeException("卷号:" + shipmentRollVo.getRollNo() + "不存在");
         }
-        if (rollData.getStatusCode().equals(2)) {
+        if (!rollData.getStatusCode().equals(2)) {
             throw new RuntimeException("卷号:" + rollData.getFinalRollNo() + "状态为" + rollData.getStatus());
         }
         // 获取PartNo 的属性
diff --git a/src/main/resources/mapper/material/ProductionStockMapper.xml b/src/main/resources/mapper/material/ProductionStockMapper.xml
index 2434e45..0758c7c 100644
--- a/src/main/resources/mapper/material/ProductionStockMapper.xml
+++ b/src/main/resources/mapper/material/ProductionStockMapper.xml
@@ -174,7 +174,7 @@
     </select>
 
 <select id="getRollBySysBatch" resultType="SoFinalRollOutData">
-    select site,order_no,part_no,roll_qty,status_code,create_date,final_roll_no,manufacture_date from so_final_roll
+    select site,order_no,part_no,roll_qty,status_code,created_date,final_roll_no,manufacture_date,status from so_final_roll
     where site=#{site} and system_batch_no=#{systemBatchNo}
 </select>
 </mapper>
\ No newline at end of file