预订单修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrPackageBookingOrderController.java

@@ -39,14 +39,14 @@ public class QrPackageBookingOrderController {
 
     @ApiOperation("查看预订单详情")
     @GetMapping("/queryOrderFormDetail")
-    public BaseResponse queryOrderFormDetail(@Validated QueryOrderFormDetailReq queryOrderFormDetailReq) {
+    public BaseResponse<QueryOrderFormDetailRes> queryOrderFormDetail(@Validated QueryOrderFormDetailReq queryOrderFormDetailReq) {
         QueryOrderFormDetailRes queryOrderFormDetailRes = qrPackageBookingOrderService.queryOrderFormDetail(queryOrderFormDetailReq);
         return BaseResponse.create(queryOrderFormDetailRes);
     }
 
     @ApiOperation("查看预订单查询分页")
     @GetMapping("/queryOrderFormLimit")
-    public BaseResponse queryOrderFormLimit(@Validated QueryOrderFormLimitReq queryOrderFormLimitReq) {
+    public BaseResponse<QueryOrderFormLimitRes> queryOrderFormLimit(@Validated QueryOrderFormLimitReq queryOrderFormLimitReq) {
         QueryOrderFormLimitRes res=qrPackageBookingOrderService.queryOrderFormLimit(queryOrderFormLimitReq);
         return BaseResponse.create(res);
     }
@@ -60,7 +60,7 @@ public class QrPackageBookingOrderController {
 
     @ApiOperation("预订单下拉框选项")
     @GetMapping("/reservationOrderQuery")
-    public BaseResponse reservationOrderQuery() {
+    public BaseResponse<ReservationOrderQueryRes> reservationOrderQuery() {
         ReservationOrderQueryRes res = qrPackageBookingOrderService.reservationOrderQuery();
         return BaseResponse.create(res);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QueryOrderFormLimitVO.java

@@ -45,8 +45,8 @@ public class QueryOrderFormLimitVO implements Serializable {
     private LocalDateTime updateTime;
 
     @ApiModelProperty("描述")
-    private String descripTion;
+    private String description;
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty("状态 1-已创建 2-已绑定")
     private String type;
 }

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

@@ -20,8 +20,27 @@ import java.util.List;
 @Schema
 public class QueryOrderFormDetailRes implements Serializable {
 
+    @ApiModelProperty("关联码包列表")
     List<QueryPackageDetailBean> queryPackageDetailBean;
 
+    @ApiModelProperty("预订单号")
+    private String bookingOrder;
+
+    @ApiModelProperty("物料名称")
+    private String materialName;
+
+    @ApiModelProperty("采购数量")
+    private Long purchaseCount;
+
+    @ApiModelProperty("二维码类型 1-箱码 2-盖码")
+    private Integer qrType;
+
+    @ApiModelProperty("包材厂")
+    private String factoryCoverName;
+
+    @ApiModelProperty("描述")
+    private String description;
+
     /**
      * 码包对象
      *
@@ -50,23 +69,4 @@ public class QueryOrderFormDetailRes implements Serializable {
 
     }
 
-    @ApiModelProperty("预订单号")
-    private String bookingOrder;
-
-    @ApiModelProperty("物料名称")
-    private String materialName;
-
-    @ApiModelProperty("采购数量")
-    private Long purchaseCount;
-
-    @ApiModelProperty("二维码类型 1-箱码 2-盖码")
-    private Integer qrType;
-
-    @ApiModelProperty("包材厂")
-    private String factoryCoverName;
-
-    @ApiModelProperty("描述")
-    private String description;
-
-
 }

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

@@ -63,9 +63,9 @@ public class QueryOrderFormLimitRes extends PageResp implements Serializable {
         private LocalDateTime updateTime;
 
         @ApiModelProperty("描述")
-        private String descripTion;
+        private String description;
 
-        @ApiModelProperty("状态")
+        @ApiModelProperty("状态 1-已创建 2-已绑定")
         private String type;
     }
 }

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

@@ -51,7 +51,7 @@ public class ReservationOrderQueryRes implements Serializable {
         @ApiModelProperty("是否一级包材厂")
         private Integer isFirstFactory;
 
-        @ApiModelProperty(name = "包材厂id")
+        @ApiModelProperty("包材厂id")
         private Long factoryCoverId;
     }
 

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

@@ -38,22 +38,22 @@
 
     <select id="queryOrderFormLimit" resultType="com.abi.qms.platform.dao.vo.result.QueryOrderFormLimitVO">
         SELECT
-            bookingOrder.id id,
-            bookingOrder.booking_order bookingOrder,
-            package.sap_order_no sapOrderNo,
-            meterial.material_name materialName,
-            bookingOrder.purchase_count purchaseCount,
-            bookingOrder.qr_type qrType,
-            factory.factory_name factoryName,
-            package.update_by updateBy,
-            package.update_time updateTime,
-            bookingOrder.description descripTion,
+            bookingOrder.id,
+            bookingOrder.booking_order,
+            package.sap_order_no,
+            material.material_name,
+            bookingOrder.purchase_count,
+            bookingOrder.qr_type,
+            factory.factory_name,
+            package.update_by,
+            package.update_time,
+            bookingOrder.description,
         IF
             ( package.sap_order_no IS NULL, 1, 2 ) type
         FROM
             qr_package_booking_order AS bookingOrder
             LEFT JOIN qr_package AS package ON package.booking_order = bookingOrder.booking_order
-            LEFT JOIN base_material AS meterial ON meterial.id = package.material_id
+            LEFT JOIN base_material AS material ON material.id = package.material_id
             LEFT JOIN base_factory AS factory ON factory.id = bookingOrder.factory_cover_id
         <where>
             <if test="null != queryOrderFormLimitReq.bookingOrder and queryOrderFormLimitReq.bookingOrder !=''">
@@ -63,7 +63,7 @@
                 AND package.sap_order_no = #{queryOrderFormLimitReq.sapOrder}
             </if>
             <if test="null != queryOrderFormLimitReq.materialName and queryOrderFormLimitReq.materialName != ''">
-                AND meterial.material_name = #{queryOrderFormLimitReq.materialName}
+                AND material.material_name = #{queryOrderFormLimitReq.materialName}
             </if>
             <if test="null != queryOrderFormLimitReq.factoryCoverName and  queryOrderFormLimitReq.factoryCoverName != ''">
                 AND factory.factory_name = #{queryOrderFormLimitReq.factoryCoverName}

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/ReactBeanTest.java

@@ -1,9 +1,10 @@
 package com.abi.qms.platform;
 
-import com.abi.qms.platform.dto.res.GetPackageCodeRes;
-import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
-import com.abi.qms.platform.dto.res.ListMaterialRes;
-import com.abi.qms.platform.dto.res.ListSapCoverFactoryRes;
+import com.abi.qms.platform.dto.req.AssociateSapOrderReq;
+import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
+import com.abi.qms.platform.dto.res.QueryOrderFormDetailRes;
+import com.abi.qms.platform.dto.res.QueryOrderFormLimitRes;
+import com.abi.qms.platform.dto.res.ReservationOrderQueryRes;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +21,7 @@ import java.util.Map;
 public class ReactBeanTest {
 
     public static void main(String[] args) {
-        Class clz = ListSapCoverFactoryRes.SapCoverFactoryBean.class;
+        Class clz = ReservationOrderQueryRes.ReservationOrderQueryBean.class;
 
         Map<Class,String> classMap = new HashMap<>();
         classMap.put(String.class,"string");