feat(SaleOrder): 修复sku关联工厂；拓展排产日期

src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java

@@ -46,9 +46,21 @@ public class OmsSaleOrder implements Serializable {
 
     private String orderSource;
 
+    private Integer erpDelStatus;
+
     /** OA审批状态，订单审批状态 */
     private Integer orderCheckState;
 
+    /**
+     * 0-未完成；1->未核对；2->已核对；3->执行中；4->有异常；5->已删除
+     * 未完成，由CMS开单过来，但为同步到ERP
+     * 未核对，ERP的状态
+     * 已核对，ERP的状态
+     * 有异常，表示开单过程中队列有异常，取消该异常重新开单成功或者删除错误的队列
+     * 已删除，ERP删除的订单
+     */
+    private Integer orderStatusCombo;
+
     /** OA审批状态，订单审批状态 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -256,6 +268,9 @@ public class OmsSaleOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDate preDeliveryDate;
 
+    /** 生产备注 */
+    private String productionRemark;
+
     /**
      * 预计生产日期
      */

src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java

@@ -10,7 +10,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -93,6 +95,16 @@ public class OmsSaleOrderItem implements Serializable {
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
 
+    /** 生产备注 */
+    private String productionRemark;
+
+    /**
+     * 预计生产日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate preProductionDate;
+
     /** 最后更新时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -134,7 +146,6 @@ public class OmsSaleOrderItem implements Serializable {
     private Object spuInfo;
 
     /** skuBelong */
-    @TableField(exist = false)
     private Object skuBelong;
 
     /** skuBelong */

src/main/java/com/qs/serve/modules/oms/entity/OmsShoppingCart.java

@@ -138,5 +138,8 @@ public class OmsShoppingCart implements Serializable {
 
     @TableField(exist = false)
     private BigDecimal volume;
+
+    @TableField(exist = false)
+    private String skuBelong;
 }
 

src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderItemMapper.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.oms.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.oms.entity.OmsSaleOrderItem;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 订单明细 Mapper
@@ -11,5 +12,12 @@ import com.qs.serve.modules.oms.entity.OmsSaleOrderItem;
  */
 public interface OmsSaleOrderItemMapper extends BaseMapper<OmsSaleOrderItem> {
 
+    @Update("update oms_sale_order_item " +
+            "left join goods_sku  " +
+            "on oms_sale_order_item.sku_id = goods_sku.id " +
+            "set oms_sale_order_item.sku_belong = goods_sku.belong " +
+            "where oms_sale_order_item.sku_belong is null and goods_sku.belong is not null")
+    int updateItemSkuBelong();
+
 }
 

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java

@@ -320,6 +320,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
                 orderItem.setSkuTitle(goodsSku.getSkuName());
                 orderItem.setSkuCode(goodsSku.getSkuCode());
                 orderItem.setSpecValues(goodsSku.getSpecInfos());
+                orderItem.setSkuBelong(goodsSku.getBelong());
                 orderItem.setSkuUnit(goodsSku.getUnitName());
                 orderItem.setSkuImg(goodsSku.getPicUrl());
                 orderItem.setSalesPrice(goodsSku.getSalesPrice());
@@ -625,6 +626,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
             orderItem.setWeight(shoppingCart.getWeight());
             orderItem.setVolume(shoppingCart.getVolume());
             orderItem.setRemark(shoppingCart.getRemark());
+            orderItem.setSkuBelong(shoppingCart.getSkuBelong());
             if (confirmOrder.getLatitudeFrom() != null && confirmOrder.getLatitudeFrom().equals("SPU")) {
                 // spu维度
                 GoodsSku goodsSku = goodsSkuService.getById(shoppingCart.getSkuId());
@@ -1017,6 +1019,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
                 break;
             }
         }
+        orderItem.setSkuBelong(sku.getBelong());
         orderItem.setWeight(sku.getWeight());
         orderItem.setVolume(sku.getVolume());
         orderItem.setSkuBatchId(batch.getId());

src/main/java/com/qs/serve/task/OmsTask.java

@@ -1,5 +1,7 @@
 package com.qs.serve.task;
 
+import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.modules.oms.mapper.OmsSaleOrderItemMapper;
 import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Component;
 public class OmsTask {
 
     OmsOrderOptionsService omsOrderOptionsService;
+    OmsSaleOrderItemMapper omsSaleOrderItemMapper;
 
     /**
      * 同步临期品到调度系统的订单中间表
@@ -25,6 +28,8 @@ public class OmsTask {
      */
     @Scheduled(cron="0 0/10 * * * ?")
     public void saveToErpOrder(){
+        AuthContextUtils.setTenant("001");
+        omsSaleOrderItemMapper.updateItemSkuBelong();
         omsOrderOptionsService.syncToErp();
     }