码包相关修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -245,10 +245,17 @@ public class QrPackageServiceImpl implements QrPackageService {
             req.setPackageBatchBeanList(batchBeanList);
         }
 
-        //3-根据物料ID查询物料类型，判断码类型，保存至码包表中
-        BaseMaterial material = baseMaterialMapper.selectById(req.getMaterialId());
-        AssertUtil.isNull(material, "物料信息不存在");
-        req.setQrType(getPackageCode(material.getMaterialType()));
+        //3-SAP:根据物料ID查询物料类型，判断码类型，保存至码包表中
+        //预订单:直接预订单放入
+        if(CodePackageOrderTypeEnum.SAP_ORDER.is(req.getOrderType())){
+            BaseMaterial material = baseMaterialMapper.selectById(req.getMaterialId());
+            AssertUtil.isNull(material, "物料信息不存在");
+            req.setQrType(getPackageCode(material.getMaterialType()));
+        }else{
+            QrPackageBookingOrder bookingOrder = qrPackageBookingOrderService.getBookingOrder(req.getBookingOrder());
+            AssertUtil.isNull(bookingOrder, "预订单不存在");
+            req.setQrType(bookingOrder.getQrType());
+        }
 
         //4-如果是盖码，那么查询盖码得默认箱码幅面，并放入入参
         if(QrTypeEnum.CAP.is(req.getQrType())){
@@ -333,6 +340,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         }
 
         qrPackage.setSapOrderNo(req.getSapOrderNo());
+        qrPackage.setBookingOrder(req.getBookingOrder());
         qrPackage.setMaterialId(req.getMaterialId());
         qrPackage.setMaterialCode(req.getMaterialCode());
         qrPackage.setFactoryCoverId(req.getFactoryCoverId());