订单添加交期

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -72,6 +72,11 @@ public class OrderInfo extends BasePo {
     private Date wlnPrintTime;
 
     /**
+     * 交期
+     */
+    private Date deliveryTime;
+
+    /**
      * 万里牛同步时间戳
      */
     private Long modifyTime;

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderInfoVo.java

@@ -4,7 +4,6 @@ import com.sd.business.entity.order.po.OrderInfo;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,11 +22,6 @@ public class OrderInfoVo extends OrderInfo {
     private String departmentName;
 
     /**
-     * 交期
-     */
-    private Date deliveryTime;
-
-    /**
      * 订单商品
      */
     private List<OrderSkuVo> orderSkuList;

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

@@ -14,4 +14,44 @@ import lombok.Setter;
 @Setter
 public class ProductionTaskVo extends ProductionTask {
 
+    /**
+     * 设计图
+     */
+    private String blueprint;
+
+    /**
+     * bom图
+     */
+    private String mainImgUrl;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 万里牛单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * sku品号
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku品名
+     */
+    private String skuSpecName;
+
+    /**
+     * bom品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * bom品号
+     */
+    private String bomSpecName;
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -1,7 +1,6 @@
 package com.sd.business.service.order.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.exception.ServiceException;
@@ -75,14 +74,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
 
         Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        List<OrderInfoVo> records = page.getRecords();
-        if (records.size() == 0) {
-            return page;
-        }
-
-        for (OrderInfoVo record : records) {
-            record.setDeliveryTime(DateUtil.offsetDay(record.getCreateTime(), 1));
-        }
 
         return page;
     }
@@ -96,10 +87,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
 
         // 订单
         OrderInfoVo result = BeanUtil.toBean(orderInfo, OrderInfoVo.class);
-        result.setDeliveryTime(DateUtil.offsetDay(result.getCreateTime(), 1));
-        if (orderInfo.getDepartmentId() == null) {
-            return result;
-        }
         Department department = departmentService.getById(orderInfo.getDepartmentId());
         if (department != null) {
             result.setDepartmentName(department.getName());
@@ -157,7 +144,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         orderSkuService.remove(q -> q.eq(OrderSku::getOrderId, id));
         orderSkuBomService.remove(q -> q.eq(OrderSkuBom::getOrderId, id));
 
-
         OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
         orderOperatingLog.setType(30);
         orderOperatingLog.setOrderId(id);

sd-business/src/main/resources/mapper/order/OrderMapper.xml

@@ -14,6 +14,7 @@
                o.wln_create_time,
                o.wln_approve_time,
                o.wln_print_time,
+               o.delivery_time,
                o.modify_time,
                o.express_delivery_code,
                o.status,

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

@@ -14,8 +14,22 @@
                pt.create_user,
                pt.create_time,
                pt.update_user,
-               pt.update_time
+               pt.update_time,
+
+               oi.blueprint,
+               bs.main_img_url,
+               oi.code     orderCode,
+               oi.wln_code orderWlnCode,
+               ss.code     skuSpecCode,
+               ss.name     skuSpecName,
+               bs.code     bomSpecCode,
+               bs.name     bomSpecName
+
         from production_task pt
+                 left join sku_spec ss on pt.sku_spec_id = ss.id
+                 left join sku s on ss.sku_id = s.id
+                 left join bom_spec bs on ss.bom_spec_id = bs.id
+                 left join order_info oi on pt.order_id = oi.id
             ${ew.customSqlSegment}
     </select>
 

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -276,6 +276,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         orderInfo.setWlnCreateTime(wlnOrder.getDate("create_time"));
         orderInfo.setWlnApproveTime(wlnOrder.getDate("approve_time"));
         orderInfo.setWlnPrintTime(wlnOrder.getDate("print_time"));
+        orderInfo.setDeliveryTime(DateUtil.offsetDay(orderInfo.getWlnCreateTime(), 1));
         orderInfo.setProvince(wlnOrder.getString("province"));
         orderInfo.setCity(wlnOrder.getString("city"));
         orderInfo.setCounty(wlnOrder.getString("district"));