From ece1e1220c3080b93e404bb597b57cbc02e36741 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 31 Jul 2024 14:19:27 +0800
Subject: [PATCH] 2024/07/02

---
 .../shipment/service/impl/ShipmentBoxServiceImpl.java        | 5 +++--
 .../modules/shipment/service/impl/ShipmentServiceImpl.java   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentBoxServiceImpl.java b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentBoxServiceImpl.java
index b46a9a5..904fb5a 100644
--- a/src/main/java/com/spring/modules/shipment/service/impl/ShipmentBoxServiceImpl.java
+++ b/src/main/java/com/spring/modules/shipment/service/impl/ShipmentBoxServiceImpl.java
@@ -163,8 +163,9 @@ public class ShipmentBoxServiceImpl extends ServiceImpl<ShipmentBoxMapper, Shipm
         if (StringUtils.isEmpty(soFinalRollData.getSystemBatchNo()) || soFinalRollData.getSystemBatchNo().length() < 10){
             throw new RuntimeException("物料"+rollData.getPartNo()+"系统批次号格式不正确或不存在!");
         }
+        String partBatchNo = soFinalRollData.getSystemBatchNo().substring(0,10);
         //todo
-        String BatchNo = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00002");
+//        String BatchNo = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00002");
 
         Date productionDate = box.getCreateDate();
         BigDecimal qty = new BigDecimal(0);
@@ -196,6 +197,6 @@ public class ShipmentBoxServiceImpl extends ServiceImpl<ShipmentBoxMapper, Shipm
 
         String jobNo = shipmentDetail.getOrderNumber()+"-"+shipmentDetail.getLineNo()+"-"+shipmentDetail.getRelNo();
 
-        return new ShipmentBoxPrint(vendorCode, ACCPartNo, partDesc, BatchNo, productionDate, qty, version, uom, bin,  Config, MCO,tool, level, phaseCode, customerName, partNo, desc, boxQty, totalQty, po, shipDate, jobNo);
+        return new ShipmentBoxPrint(vendorCode, ACCPartNo, partDesc, partBatchNo, productionDate, qty, version, uom, bin,  Config, MCO,tool, level, phaseCode, customerName, partNo, desc, boxQty, totalQty, po, shipDate, jobNo);
     }
 }
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 3ca9d19..18c9933 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
@@ -217,11 +217,11 @@ public class ShipmentServiceImpl extends ServiceImpl<ShipmentMapper, Shipment> i
                 throw new RuntimeException("物料"+box.getPartNo()+"系统批次号格式不正确或不存在!");
             }
             String batchNo = finalRollData.getSystemBatchNo().substring(0,10);
-            String partBatchNo = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00002");
+//            String partBatchNo = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00002");
             String partMCO = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00017");
             BigDecimal qty = detail.getSaleQty();
             Date proDate = ship.getCreateDate();
-            ShipmentPrint shipmentPrint = new ShipmentPrint(address,address1,address2,city,state,country,postCode,vendorCode,detail.getPoNumber(),detail.getRefId(),ACCPartNo,part.getPartDesc(),version, qty,part.getUmId(),proDate,partBatchNo,part.getPhaseDescription(),partMCO);
+            ShipmentPrint shipmentPrint = new ShipmentPrint(address,address1,address2,city,state,country,postCode,vendorCode,detail.getPoNumber(),detail.getRefId(),ACCPartNo,part.getPartDesc(),version, qty,part.getUmId(),proDate,batchNo,part.getPhaseDescription(),partMCO);
             printList.add(shipmentPrint);
         }
         // 查询明细