预订单修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveOrderFormReq.java

@@ -25,6 +25,7 @@ public class SaveOrderFormReq implements Serializable {
     private Long id;
 
     @Size(max = 20, message = "预订单号长度超过20")
+    @NotNull(message = "预订单号为空")
     @ApiModelProperty( "预订单号")
     private String bookingOrder;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/QueryOrderFormDetailRes.java

@@ -38,6 +38,9 @@ public class QueryOrderFormDetailRes implements Serializable {
     @ApiModelProperty("包材厂")
     private String factoryCoverName;
 
+    @Schema(name = "包材厂id")
+    private Long factoryCoverId;
+
     @ApiModelProperty("描述")
     private String description;
 

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

@@ -64,27 +64,21 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveOrderForm(SaveOrderFormReq saveOrderFormReq) {
-        QrPackageBookingOrder qPackageBookingOrderCopy = PojoConverterUtils.copy(saveOrderFormReq, QrPackageBookingOrder.class);
-        if(null == qPackageBookingOrderCopy.getId() &&
-                !ObjectUtils.isEmpty(qPackageBookingOrderCopy.getBookingOrder())){
+        QrPackageBookingOrder qrPackageBookingOrderCopy = PojoConverterUtils.copy(saveOrderFormReq, QrPackageBookingOrder.class);
+        if(null == qrPackageBookingOrderCopy.getId() &&
+                !ObjectUtils.isEmpty(qrPackageBookingOrderCopy.getBookingOrder())){
             //新增
-            if(ObjectUtils.isEmpty(qPackageBookingOrderCopy.getBookingOrder())){
-                throw new BusinessException("预订单单号为空");
-            }
             QueryWrapper<QrPackageBookingOrder> qrFormatQw = new QueryWrapper<>();
-            qrFormatQw.eq("booking_order",qPackageBookingOrderCopy.getBookingOrder());
+            qrFormatQw.eq("booking_order",qrPackageBookingOrderCopy.getBookingOrder());
             Integer count = qrPackageBookingOrderMapper.selectCount(qrFormatQw);
             if (!count.equals(0)) {
                 throw new BusinessException("预订单号已存在");
             }
-            qrPackageBookingOrderMapper.insert(qPackageBookingOrderCopy);
+            qrPackageBookingOrderMapper.insert(qrPackageBookingOrderCopy);
         } else {
             //修改
-            if(!ObjectUtils.isEmpty(qPackageBookingOrderCopy.getBookingOrder())){
-                throw new BusinessException("预订单单号不可修改");
-            }
-            qPackageBookingOrderCopy.setBookingOrder(null);
-            qrPackageBookingOrderMapper.updateById(qPackageBookingOrderCopy);
+            qrPackageBookingOrderCopy.setBookingOrder(null);
+            qrPackageBookingOrderMapper.updateById(qrPackageBookingOrderCopy);
         }
     }
 
@@ -97,12 +91,16 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
      */
     @Override
     public QueryOrderFormDetailRes queryOrderFormDetail(QueryOrderFormDetailReq queryOrderFormDetailReq) {
+        //查询预订单
         QueryWrapper<QrPackageBookingOrder> qrFormatQw = new QueryWrapper<>();
         qrFormatQw.eq("booking_order",queryOrderFormDetailReq.getBookingOrder());
         qrFormatQw.eq("is_delete",0);
         QrPackageBookingOrder qrPackageBookingOrder = qrPackageBookingOrderMapper.selectOne(qrFormatQw);
+        //查询包材厂
         BaseFactory baseFactory = baseFactoryMapper.selectById(qrPackageBookingOrder.getFactoryCoverId());
+        //关联码包信息
         List<QueryOrderFormDetailVO> queryQueryOrderFormDetailVO= qrPackageBookingOrderMapper.queryOrderFormDetail(queryOrderFormDetailReq);
+
         // 封装出参
         QueryOrderFormDetailRes orderFormDetailRes = PojoConverterUtils.copy(qrPackageBookingOrder, QueryOrderFormDetailRes.class);
         if(!ObjectUtils.isEmpty(queryQueryOrderFormDetailVO)){
@@ -112,6 +110,7 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         if(!ObjectUtils.isEmpty(baseFactory)){
             orderFormDetailRes.setFactoryCoverName(baseFactory.getFactoryName());
         }
+
         return orderFormDetailRes;
     }