标签打印部分逻辑修改 选择打印的批次 打印数据

src/main/java/com/spring/modules/shipment/entity/ShipmentDetail.java

@@ -35,5 +35,7 @@ public class ShipmentDetail {
 
     @TableField(exist = false)
     private String batchNo;
+    @TableField(exist = false)
+    private BigDecimal boxQty;
 
 }

src/main/java/com/spring/modules/shipment/service/impl/ShipmentRollServiceImpl.java

@@ -125,13 +125,19 @@ public class ShipmentRollServiceImpl extends ServiceImpl<ShipmentRollMapper, Shi
             saleQty = saleQty.add(detail.getSaleQty());
         }
         // 获得 箱子 卷数
-        BigDecimal num = saleQty.divide(new BigDecimal(value), 0, RoundingMode.UP);
+       BigDecimal num = saleQty.divide(new BigDecimal(value), 0, RoundingMode.UP);
         // 获得该物料已经扫描多少卷
         Integer count = lambdaQuery()
                 .eq(ShipmentRoll::getShipmentId, shipmentRollVo.getShipmentId())
                 .eq(ShipmentRoll::getPartNo, rollData.getPartNo())
                 //.eq(ShipmentRoll::getBoxNo, shipmentRollVo.getBoxNo())
                 .eq(ShipmentRoll::getSite, shipmentRollVo.getSite()).count();
+        //查询已经扫描的卷数量
+        List<ShipmentRoll> scannedRolls = lambdaQuery()
+                .eq(ShipmentRoll::getShipmentId, shipmentRollVo.getShipmentId())
+                .eq(ShipmentRoll::getPartNo, rollData.getPartNo())
+                //.eq(ShipmentRoll::getBoxNo, shipmentRollVo.getBoxNo())
+                .eq(ShipmentRoll::getSite, shipmentRollVo.getSite()).list();
         BigDecimal needRollNum = num.subtract(new BigDecimal(count));
         if (BigDecimal.ZERO.compareTo(needRollNum) == 0){
             throw new RuntimeException("该物料已满足发货数量,无法再次添加!");

src/main/java/com/spring/modules/shipment/service/impl/ShipmentServiceImpl.java

@@ -333,7 +333,8 @@ public class ShipmentServiceImpl extends ServiceImpl<ShipmentMapper, Shipment> i
         }*/
         String batchNo = shipmentDetail.getBatchNo();
         String partMCO = shipmentRollMapper.queryPartPropertyItem(part.getSite(),part.getPartNo(),"P00017");
-        BigDecimal qty = queryShipDetail.getSaleQty();
+        //BigDecimal qty = shipmentDetail.getSaleQty();
+        BigDecimal qty = shipmentDetail.getBoxQty();
         Date proDate = ship.getCreateDate();
         ShipmentPrint shipmentPrint = new ShipmentPrint(address,address1,address2,city,state,country,postCode,vendorCode, queryShipDetail.getPoNumber(), queryShipDetail.getRefId(),ACCPartNo,part.getPartDesc(),version, qty,part.getUmId(),proDate,batchNo,part.getPhaseDescription(),partMCO);
         return shipmentPrint;