管理预订单时新增包材厂跟啤酒厂id2

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

@@ -204,6 +204,7 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         QueryWrapper<QrPackageSapOrderItem> qrPackageSapOrderItem = new QueryWrapper<>();
         qrPackageSapOrderItem.eq("sap_order_no",associateSapOrderReq.getSapOrder());
         qrPackageSapOrderItem.eq("sap_material_id",associateSapOrderReq.getMaterialCode());
+        qrPackageSapOrderItem.eq("is_delete",0);
         QrPackageSapOrderItem queryQrPackageSapOrderItem = qrPackageSapOrderItemMapper.selectOne(qrPackageSapOrderItem);
         //3.查询该笔预订单相关数据
         QrPackageBookingOrder qrPackageBookingOrder = qrPackageBookingOrderMapper.selectById(associateSapOrderReq.getId());
@@ -242,7 +243,6 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         qrPackage.setSapOrderNo(associateSapOrderReq.getSapOrder());
         qrPackage.setMaterialId(baseMaterial.getId());
         qrPackage.setMaterialCode(associateSapOrderReq.getMaterialCode());
-        qrPackage.setFactoryCoverId(factory.getId());
         //根据 sap物料信息的啤酒厂 跟 状态为2（啤酒厂）查询
         BaseFactory beerFactory = factoryService.getFactoryByCode(queryQrPackageSapOrderItem.getSapBeerFactoryId(), FactoryTypeEnum.BEER.getCode());
         if(null != beerFactory){