From 5d1fe4960df3dfd6a34b9b0e27a694efaa3a5b59 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 2 Jan 2025 17:20:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(SaleOrder):=20=E4=BF=AE=E5=A4=8Dsku?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=B7=A5=E5=8E=82=EF=BC=9B=E6=8B=93=E5=B1=95?= =?UTF-8?q?=E6=8E=92=E4=BA=A7=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qs/serve/modules/oms/entity/OmsSaleOrder.java | 15 +++++++++++++++ .../modules/oms/entity/OmsSaleOrderItem.java | 13 ++++++++++++- .../serve/modules/oms/entity/OmsShoppingCart.java | 3 +++ .../oms/mapper/OmsSaleOrderItemMapper.java | 8 ++++++++ .../oms/service/impl/OmsSaleOrderServiceImpl.java | 3 +++ src/main/java/com/qs/serve/task/OmsTask.java | 5 +++++ 6 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java index 02d7cd86..308b3df6 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java +++ b/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; + /** * 预计生产日期 */ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java index dc3aed76..02de1da2 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java +++ b/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 */ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsShoppingCart.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsShoppingCart.java index 2fefc00b..c6e5436b 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsShoppingCart.java +++ b/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; } diff --git a/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderItemMapper.java b/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderItemMapper.java index db46ccaf..8e0d332c 100644 --- a/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderItemMapper.java +++ b/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 { + @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(); + } diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index fc83b650..8424733e 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -320,6 +320,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl