diff --git a/src/main/java/com/qs/serve/modules/oms/entity/ErpSaleOrder.java b/src/main/java/com/qs/serve/modules/oms/entity/ErpSaleOrder.java new file mode 100644 index 00000000..a89d70d2 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/entity/ErpSaleOrder.java @@ -0,0 +1,186 @@ +package com.qs.serve.modules.oms.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.List; + +/** + * 订单 实体类 + * @author YenHex + * @since 2022-10-14 + */ +@Data +@TableName("oms_sale_order") +public class ErpSaleOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 订单号 */ + @NotBlank(message = "订单号不能为空") + @Length(max = 20,message = "订单号长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) + private String orderSn; + + /** 订单类型：0->普通订单;1->赠品；2->试吃品；3->临期品 */ + private Integer orderType; + + private Integer erpStatus; + + private String orderSource; + + /** 供应商ID */ + @NotNull(message = "供应商ID不能为空") + private Long supplierId; + + /** 供应商编码 */ + @NotBlank(message = "供应商编码不能为空") + @Length(max = 20,message = "供应商编码长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) + private String supplierCode; + + /** 供应商名称 */ + @NotBlank(message = "供应商名称不能为空") + @Length(max = 30,message = "供应商名称长度不能超过30字") + @TableField(condition = SqlCondition.LIKE) + private String supplierName; + + /** 供应商收货地址id */ + @NotNull(message = "供应商收货地址id不能为空") + private Long supplierAddrId; + + /** 审核人 */ + @Length(max = 32,message = "审核人长度不能超过32字") + private String checkUserId; + + /** 审核时间 */ + @Length(max = 0,message = "审核时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime checkTime; + + /** 品牌ID */ + @NotNull(message = "品牌ID不能为空") + private Long brandRuleId; + + @TableField(condition = SqlCondition.LIKE) + private String brandRuleName; + + /** 制单人id */ + @Length(max = 32,message = "制单人id长度不能超过32字") + private String userId; + + /** 制单人名称 */ + @Length(max = 20,message = "制单人名称长度不能超过20字") + @TableField(condition = SqlCondition.LIKE) + private String userName; + + /** 制单人ERP编码 */ + @Length(max = 32,message = "制单人ERP编码长度不能超过32字") + @TableField(condition = SqlCondition.LIKE) + private String userCode; + + /** 制单人手机号 */ + @Length(max = 255,message = "制单人手机号长度不能超过255字") + private String userPhone; + + /** CD单据备注 */ + private String cdOrderRemark; + + /** 临期品订单折扣率 */ + private BigDecimal discountRate; + + /** 适配的折扣率在OA的Id */ + private String oaRateId; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 租户id */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + /** + * 拓展查询条件 + */ + @TableField(condition = SqlCondition.LIKE) + private String cusSaleRegion; + @TableField(condition = SqlCondition.LIKE) + private String cusSaleRegion2; + @TableField(condition = SqlCondition.LIKE) + private String cusSaleRegion3; + @TableField(condition = SqlCondition.LIKE) + private String cusSaleRegionAll; + @TableField(condition = SqlCondition.LIKE) + private String cusSaleRegionCodes; + @TableField(condition = SqlCondition.LIKE) + private String cusBigRegion; + @TableField(condition = SqlCondition.LIKE) + private String cusProvince; + @TableField(condition = SqlCondition.LIKE) + private String cusCity; + @TableField(condition = SqlCondition.LIKE) + private String cusArea; + @TableField(condition = SqlCondition.LIKE) + private String cusBizRegionAll; + @TableField(condition = SqlCondition.LIKE) + private String cusBizRegionCodes; + @TableField(condition = SqlCondition.LIKE) + private String allBands; + + + private Date preFinishedDate; + private Date preDeliveryDate; + private String businessType; + private String saleDept; + private String saleType; + private String closerName; + private String verifierName; + private String currency; + private Integer exchangeRate; + +} + diff --git a/src/main/java/com/qs/serve/modules/oms/entity/ErpSaleOrderItem.java b/src/main/java/com/qs/serve/modules/oms/entity/ErpSaleOrderItem.java new file mode 100644 index 00000000..1f6edd99 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/oms/entity/ErpSaleOrderItem.java @@ -0,0 +1,119 @@ +package com.qs.serve.modules.oms.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +/** + * 订单明细 实体类 + * @author YenHex + * @since 2022-10-14 + */ +@Data +@TableName("oms_sale_order_item") +public class ErpSaleOrderItem implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 订单id */ + private Long orderId; + + /** 订单sn */ + @Length(max = 32,message = "订单sn长度不能超过32字") + private String orderSn; + + /** 商品id */ + private Long spuId; + + /** 商品编码 */ + @Length(max = 20,message = "商品编码长度不能超过20字") + private String spuCode; + + /** 商品名称 */ + @Length(max = 30,message = "商品名称长度不能超过30字") + private String spuTitle; + + private String skuTitle; + + /** skuBatchId */ + private Long skuBatchId; + + /** skuBatchCode */ + private String skuBatchCode; + + private Long skuId; + + /** sku编码 */ + @Length(max = 20,message = "sku编码长度不能超过20字") + private String skuCode; + + /** sku单位 */ + @Length(max = 20,message = "sku单位长度不能超过20字") + private String skuUnit; + + /** sku图片 */ + @Length(max = 255,message = "sku图片长度不能超过255字") + private String skuImg; + + /** 规格值 */ + @Length(max = 255,message = "规格值长度不能超过255字") + private String specValues; + + /** 数量 */ + private Integer quantity; + + /** 销售价 */ + private BigDecimal salesPrice; + + /** 客户价 */ + private BigDecimal cusPrice; + + /** 市场价 */ + private BigDecimal marketPrice; + + + private BigDecimal weight; + + private BigDecimal volume; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 最后更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 逻辑删除标记（0：显示；1：隐藏） */ + @JsonIgnore + @JsonProperty + private String delFlag; + +} + diff --git a/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderItemMapper.java b/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderItemMapper.java index 2b4f053f..53bf7ed8 100644 --- a/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderItemMapper.java +++ b/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderItemMapper.java @@ -2,6 +2,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.ErpSaleOrderItem; import com.qs.serve.modules.oms.entity.OmsSaleOrderItem; /** @@ -10,7 +11,7 @@ import com.qs.serve.modules.oms.entity.OmsSaleOrderItem; * @date 2022-10-14 */ @DS("qisheng") -public interface ErpSaleOrderItemMapper extends BaseMapper { +public interface ErpSaleOrderItemMapper extends BaseMapper { } diff --git a/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java b/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java index 863621e7..98fbd0d8 100644 --- a/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java +++ b/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.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.common.model.dto.SimpleKeyValue; +import com.qs.serve.modules.oms.entity.ErpSaleOrder; import com.qs.serve.modules.oms.entity.OmsSaleOrder; import org.apache.ibatis.annotations.Select; @@ -15,7 +16,7 @@ import java.util.List; * @date 2022-10-14 */ @DS("qisheng") -public interface ErpSaleOrderMapper extends BaseMapper { +public interface ErpSaleOrderMapper extends BaseMapper { } diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java index 4baea14e..af943e03 100644 --- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java +++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java @@ -74,7 +74,7 @@ public class TzcPolicyController { private TbsBudgetLogService budgetLogService; private BmsRegion2Service bmsRegion2Service; - //@GetMapping("succ") + @GetMapping("succ") public R succ(Long id,String all){ if("all".equals(all)){ LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java index 7f16f73a..7ec64c8f 100644 --- a/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java @@ -375,13 +375,14 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ // log.debug("policySyncInvUrl:{}\n result:{}",policySyncInvUrl,rs); String rs2 = HttpUtil.doPost(policySyncCateUrl, dataJson, null); log.debug("policySyncCateUrl:{}\n result:{}",policySyncCateUrl,rs2); - + if(rs2.contains("\"status\":200")){ + TzcPolicyItem updParam = new TzcPolicyItem(); + updParam.setId(policyItemId); + updParam.setPolicyItemStatus(TzPolicyItemStatus.Status_2_SyncSuccess); + tzcPolicyItemService.updateById(updParam); + } //保存异步处理的 //xiaoLuTonService.savePolicyItem(policyItemDto); - TzcPolicyItem updParam = new TzcPolicyItem(); - updParam.setId(policyItemId); - updParam.setPolicyItemStatus(TzPolicyItemStatus.Status_2_SyncSuccess); - tzcPolicyItemService.updateById(updParam); } }