预订单修改

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

@@ -3,6 +3,7 @@ package com.abi.qms.platform.dto.req;
 import com.abi.task.common.api.base.PageReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,6 +24,9 @@ public class ListQrPackageReq extends PageReq implements Serializable {
 	@ApiModelProperty("SAP单号")
 	private String sapOrderNo;
 
+	@Schema(name = "预订单号")
+	private String bookingOrder;
+
 	@ApiModelProperty("物料id")
 	private Long materialId;
 

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

@@ -4,6 +4,7 @@ import com.abi.task.common.api.base.PageResp;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -48,6 +49,9 @@ public class ListQrPackageRes extends PageResp implements Serializable {
         @ApiModelProperty("SAP单号")
         private String sapOrderNo;
 
+        @Schema(name = "预订单号")
+        private String bookingOrder;
+
         @ApiModelProperty(value = "包材厂id")
         private Long factoryCoverId;
 

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

@@ -1,5 +1,7 @@
 package com.abi.qms.platform.dto.res;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,8 +22,8 @@ import java.util.List;
 @Schema
 public class QueryOrderFormDetailRes implements Serializable {
 
-    @ApiModelProperty("关联码包列表")
-    List<QueryPackageDetailBean> queryPackageDetailBean;
+    @ApiModelProperty("id")
+    private Long id;
 
     @ApiModelProperty("预订单号")
     private String bookingOrder;
@@ -44,6 +46,9 @@ public class QueryOrderFormDetailRes implements Serializable {
     @ApiModelProperty("描述")
     private String description;
 
+    @ApiModelProperty("关联码包列表")
+    List<QueryPackageDetailBean> queryPackageDetailBean;
+
     /**
      * 码包对象
      *

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

@@ -131,15 +131,19 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
      */
     @Override
     public QueryOrderFormLimitRes queryOrderFormLimit(QueryOrderFormLimitReq queryOrderFormLimitReq) {
+       //查询数据
        IPage<QueryOrderFormLimitVO> iPage = qrPackageBookingOrderMapper.queryOrderFormLimit(PageUtil.createPage(queryOrderFormLimitReq), queryOrderFormLimitReq);
        List<QueryOrderFormLimitVO> records = iPage.getRecords();
        if(ObjectUtils.isEmpty(records)){
            new BusinessException("查询列表为空");
        }
+
+       //构造出参
        QueryOrderFormLimitRes res= new QueryOrderFormLimitRes();
        PageUtil.copyPageInfo(res, iPage);
        List<QueryOrderFormLimitRes.QueryOrderFormLimitBean> queryOrderFormLimitBeans = PojoConverterUtils.copyList(records, QueryOrderFormLimitRes.QueryOrderFormLimitBean.class);
        res.setQueryOrderFormLimitBean(queryOrderFormLimitBeans);
+
        return res;
     }
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageBookingOrderMapper.xml

@@ -42,7 +42,7 @@
         SELECT
             bookingOrder.id,
             bookingOrder.booking_order,
-            package.sap_order_no,
+            bookingOrder.sap_order_no,
             material.material_name,
             bookingOrder.purchase_count,
             bookingOrder.qr_type,
@@ -50,8 +50,7 @@
             ui.user_name AS update_by,
             package.update_time,
             bookingOrder.description,
-        IF
-            ( package.id IS NULL, 1, 2 ) type
+            if(package.id is null, 1, 2) as type
         FROM
             qr_package_booking_order AS bookingOrder
             LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrPackageMapper.xml

@@ -39,6 +39,7 @@
             qp.factory_cover_id,
             qp.box_code_format_id,
             qp.sap_order_no,
+            qp.booking_order,
             qp.qr_number,
             qp.apply_status,
             qp.is_download,
@@ -71,6 +72,9 @@
             <if test="param.sapOrderNo != null and param.sapOrderNo != ''">
                 AND qp.sap_order_no like concat('%',#{param.sapOrderNo},'%')
             </if>
+            <if test="param.bookingOrder != null and param.bookingOrder != ''">
+                AND qp.booking_order like concat('%',#{param.bookingOrder},'%')
+            </if>
             <if test="param.factoryCoverId != null">
                 AND (qp.factory_cover_id = #{param.factoryCoverId} or qp.factory_cover_level_two_id =
                 #{param.factoryCoverId})