生产订单添加交期

sd-business/src/main/java/com/sd/business/entity/production/dto/SetTagDto.java

@@ -3,6 +3,7 @@ package com.sd.business.entity.production.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
@@ -19,7 +20,7 @@ public class SetTagDto {
     /**
      * 标签值
      */
-    @NotEmpty(message = "标签值不能为空")
+    @NotBlank(message = "标签值不能为空")
     private String tag;
 
 }

sd-business/src/main/java/com/sd/business/entity/production/vo/ProductionOrderVo.java

@@ -11,32 +11,43 @@ import java.util.List;
 public class ProductionOrderVo {
 
     /**
-     * 进度
-     */
-    List<ProductionOrderScheduleVo> productionOrderScheduleVoList;
-    /**
      * 事业部
      */
     private String departmentName;
+
     /**
      * 订单id
      */
     private Long orderId;
+
     /**
      * 订单号
      */
     private String code;
+
     /**
      * 万里牛订单号
      */
     private String wlnCode;
+
     /**
      * 快递单号
      */
     private String expressDeliveryCode;
+
     /**
      * 下单时间
      */
     private Date wlnCreateTime;
 
+    /**
+     * 交期
+     */
+    private Date deliveryTime;
+
+    /**
+     * 进度
+     */
+    private List<ProductionOrderScheduleVo> productionOrderScheduleVoList;
+
 }

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionOrderServiceImpl.java

@@ -50,6 +50,8 @@ public class ProductionOrderServiceImpl implements ProductionOrderService {
         wrapper.like("oi", OrderInfo::getWlnCode, dto.getWlnCode());
         wrapper.eq("oi", OrderInfo::getDepartmentId, dto.getDepartmentId());
         wrapper.in("oi", OrderInfo::getTag, dto.getTagList());
+        wrapper.ge("oi", OrderInfo::getDeliveryTime, dto.getBeginTime());
+        wrapper.le("oi", OrderInfo::getDeliveryTime, dto.getEndTime());
 
         Page<ProductionOrderVo> page = productionOrderMapper.getPage(dto.getPage(), wrapper);
         List<ProductionOrderVo> records = page.getRecords();
@@ -57,15 +59,16 @@ public class ProductionOrderServiceImpl implements ProductionOrderService {
             return page;
         }
 
+        // 赋值进度
         List<Long> orderIdList = records.stream().map(ProductionOrderVo::getOrderId).collect(Collectors.toList());
         List<ProductionTask> productionTaskList = productionTaskService.listByIds(orderIdList);
 
-        List<ProductionOrderScheduleVo> productionOrderScheduleVoList = productionTaskList.stream().map(item ->
-                        ProductionOrderScheduleVo.builder()
-                                .skuSpecId(item.getSkuSpecId())
-                                .productionQuantity(item.getProductionQuantity())
-                                .completeQuantity(item.getCompleteQuantity())
-                                .build())
+        List<ProductionOrderScheduleVo> productionOrderScheduleVoList = productionTaskList.stream()
+                .map(item -> ProductionOrderScheduleVo.builder()
+                        .skuSpecId(item.getSkuSpecId())
+                        .productionQuantity(item.getProductionQuantity())
+                        .completeQuantity(item.getCompleteQuantity())
+                        .build())
                 .collect(Collectors.toList());
 
         skuSpecService.attributeAssign(productionOrderScheduleVoList, ProductionOrderScheduleVo::getSkuSpecId,

sd-business/src/main/resources/mapper/production/ProductionOrderService.xml

@@ -8,7 +8,8 @@
                oi.code,
                oi.wln_code,
                oi.express_delivery_code,
-               oi.wln_create_time
+               oi.wln_create_time,
+               oi.delivery_time
         from order_info oi
                  left join department d on oi.department_id = d.id
             ${ew.customSqlSegment}