预订单下拉框选项

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

@@ -6,6 +6,7 @@ import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
 import com.abi.qms.platform.dto.req.SaveOrderFormReq;
 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 com.abi.qms.platform.service.QrPackageBookingOrderService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
@@ -56,4 +57,11 @@ public class QrPackageBookingOrderController {
         qrPackageBookingOrderService.associateSapOrder(associateSapOrderReq);
         return BaseResponse.create();
     }
+
+    @ApiOperation("预订单下拉框选项")
+    @GetMapping("/reservationOrderQuery")
+    public BaseResponse reservationOrderQuery() {
+        ReservationOrderQueryRes res = qrPackageBookingOrderService.reservationOrderQuery();
+        return BaseResponse.create(res);
+    }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrPackageBookingOrderMapper.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.dao.mapper;
 import com.abi.qms.platform.dao.entity.QrPackageBookingOrder;
 import com.abi.qms.platform.dao.vo.result.QueryOrderFormDetailVO;
 import com.abi.qms.platform.dao.vo.result.QueryOrderFormLimitVO;
+import com.abi.qms.platform.dao.vo.result.ReservationOrderQueryVO;
 import com.abi.qms.platform.dto.req.QueryOrderFormDetailReq;
 import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -37,4 +38,11 @@ public interface QrPackageBookingOrderMapper extends BaseMapper<QrPackageBooking
      */
     IPage<QueryOrderFormLimitVO> queryOrderFormLimit(IPage page, @Param("queryOrderFormLimitReq") QueryOrderFormLimitReq queryOrderFormLimitReq);
 
+    /**
+     * 预订单下拉框选项
+     * @author ludashi
+     * @date 2021/6/7 18:14
+     */
+    List<ReservationOrderQueryVO> reservationOrderQuery();
+
 }

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

@@ -0,0 +1,40 @@
+package com.abi.qms.platform.dao.vo.result;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ludashi
+ * @date 2021年06月07日 18:24
+ */
+@Data
+@ApiModel
+public class ReservationOrderQueryVO implements Serializable {
+
+    @ApiModelProperty("预订ID")
+    private Long bookingOrderId;
+
+    @ApiModelProperty("预订单号")
+    private String bookingOrder;
+
+    @ApiModelProperty("物料名称")
+    private String materialName;
+
+    @ApiModelProperty("码类型  1-箱码 2-盖码")
+    private String qrType;
+
+    @ApiModelProperty("物料采购数量")
+    private String purchaseCount;
+
+    @ApiModelProperty("包材厂")
+    private String factoryName;
+
+    @ApiModelProperty("是否一级包材厂")
+    private Integer isFirstFactory;
+
+    @ApiModelProperty(name = "包材厂id")
+    private Long factoryCoverId;
+}

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

@@ -0,0 +1,58 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ludashi
+ * @date 2021年06月07日 19:04
+ */
+@Data
+@ApiModel
+public class ReservationOrderQueryRes implements Serializable {
+
+    @ApiModelProperty("预订单下拉框选项")
+    List<ReservationOrderQueryBean> reservationOrderQueryBean;
+
+    /**
+     * 码格式Bean
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ReservationOrderQueryRes_ReservationOrderQueryBean")
+    public static class ReservationOrderQueryBean implements Serializable{
+        @ApiModelProperty("预订ID")
+        private Long bookingOrderId;
+
+        @ApiModelProperty("预订单号")
+        private String bookingOrder;
+
+        @ApiModelProperty("物料名称")
+        private String materialName;
+
+        @ApiModelProperty("码类型  1-箱码 2-盖码")
+        private String qrType;
+
+        @ApiModelProperty("物料采购数量")
+        private String purchaseCount;
+
+        @ApiModelProperty("包材厂")
+        private String factoryName;
+
+        @ApiModelProperty("是否一级包材厂")
+        private Integer isFirstFactory;
+
+        @ApiModelProperty(name = "包材厂id")
+        private Long factoryCoverId;
+    }
+
+}

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

@@ -6,6 +6,7 @@ import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
 import com.abi.qms.platform.dto.req.SaveOrderFormReq;
 import com.abi.qms.platform.dto.res.QueryOrderFormDetailRes;
 import com.abi.qms.platform.dto.res.QueryOrderFormLimitRes;
+import com.abi.qms.platform.dto.res.ReservationOrderQueryRes;
 
 public interface QrPackageBookingOrderService {
 
@@ -41,4 +42,13 @@ public interface QrPackageBookingOrderService {
      * @param associateSapOrderReq
      */
     void associateSapOrder(AssociateSapOrderReq associateSapOrderReq);
+
+    /**
+     * 预订单下拉框选项
+     * @author ludashi
+     * @date 2021/6/7 17:56
+     */
+    ReservationOrderQueryRes reservationOrderQuery();
+
+
 }

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

@@ -1,17 +1,19 @@
 package com.abi.qms.platform.service.impl;
 
 import com.abi.qms.platform.dao.entity.*;
+import com.abi.qms.platform.dao.enums.FactoryTypeEnum;
 import com.abi.qms.platform.dao.mapper.*;
 import com.abi.qms.platform.dao.vo.result.QueryOrderFormDetailVO;
 import com.abi.qms.platform.dao.vo.result.QueryOrderFormLimitVO;
+import com.abi.qms.platform.dao.vo.result.ReservationOrderQueryVO;
 import com.abi.qms.platform.dto.req.AssociateSapOrderReq;
 import com.abi.qms.platform.dto.req.QueryOrderFormDetailReq;
 import com.abi.qms.platform.dto.req.QueryOrderFormLimitReq;
 import com.abi.qms.platform.dto.req.SaveOrderFormReq;
-import com.abi.qms.platform.dto.res.ListQrVariableRes;
-import com.abi.qms.platform.dto.res.QueryOrderFormDetailRes;
-import com.abi.qms.platform.dto.res.QueryOrderFormLimitRes;
+import com.abi.qms.platform.dto.res.*;
+import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
+import com.abi.qms.platform.service.FactoryService;
 import com.abi.qms.platform.service.MaterialService;
 import com.abi.qms.platform.service.QrPackageBookingOrderService;
 import com.abi.task.common.api.exception.BusinessException;
@@ -50,6 +52,9 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
     @Autowired
     private MaterialService materialService;
 
+    @Autowired
+    private FactoryService factoryService;
+
     /**
      * 新增修改预订单
      * @author ludashi
@@ -176,4 +181,19 @@ public class QrPackageBookingOrderServiceImpl implements QrPackageBookingOrderSe
         qrPackageBookingOrderMapper.updateById(qrPackageBookingOrder);
         qrPackageMapper.updateById(qrPackage);
     }
+
+    /**
+     * 预订单下拉框选项
+     * @author ludashi
+     * @date 2021/6/7 17:56
+     */
+    @Override
+    public ReservationOrderQueryRes reservationOrderQuery() {
+        List<ReservationOrderQueryVO> reservationOrderQueryVOS = qrPackageBookingOrderMapper.reservationOrderQuery();
+        //封装出参
+        ReservationOrderQueryRes res= new ReservationOrderQueryRes();
+        List<ReservationOrderQueryRes.ReservationOrderQueryBean> reservationOrderQueryBeans = PojoConverterUtils.copyList(reservationOrderQueryVOS, ReservationOrderQueryRes.ReservationOrderQueryBean.class);
+        res.setReservationOrderQueryBean(reservationOrderQueryBeans);
+        return res;
+    }
 }

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

@@ -77,4 +77,19 @@
         </where>
     </select>
 
+    <select id="reservationOrderQuery" resultType="com.abi.qms.platform.dao.vo.result.ReservationOrderQueryVO">
+        SELECT
+            booking_order.id AS bookingOrderId,
+            booking_order.booking_order AS bookingOrder,
+            booking_order.material_name AS materialName,
+            booking_order.qr_type AS qrType,
+            booking_order.purchase_count AS purchaseCount,
+            factory.id AS factoryCoverId,
+            factory.factory_name AS factoryName,
+			factory.is_first_factory AS isFirstFactory
+        FROM
+            qr_package_booking_order AS booking_order
+            LEFT JOIN base_factory AS factory ON booking_order.factory_cover_id = factory.id
+    </select>
+
 </mapper>