半成品订单以sku维度同步

data-base/base-sync-semi-order/src/main/java/com/bailuntec/domain/pojo/SemiOrderResultInfo.java

@@ -4,10 +4,12 @@ import com.bailuntec.domain.entity.DcBaseFinancePaypal;
 import com.bailuntec.domain.entity.DcSemiOrder;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class SemiOrderResultInfo {
 
     private Boolean success;
-    private ResultData<DcSemiOrder> data;
+    private List<DcSemiOrder> data;
 
 }

data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiOrderSyncJob.java

@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
+import java.util.List;
 
 @Slf4j
 public class SemiOrderSyncJob extends PointJob {
@@ -57,18 +58,14 @@ public class SemiOrderSyncJob extends PointJob {
             if (StringUtils.isNoneBlank(palResultStr)) {
                 SemiOrderResultInfo palResultRoot = JSON.parseObject(palResultStr, SemiOrderResultInfo.class);
                 if (palResultRoot != null && palResultRoot.getSuccess().booleanValue()) {
-                    ResultData<DcSemiOrder> resultData = palResultRoot.getData();
-                    if (jobPointLog.getPageIndex().equals(0)) {
-                        jobPointLog.setPageIndex(resultData.getTotalPages() + 1);
-                    }
-                    if (resultData.getItems() != null && resultData.getItems().size() > 0) {
-
-                        for(DcSemiOrder semiOrder : resultData.getItems()) {
-                            semiOrder.setId(null);
+                    List<DcSemiOrder> resultData = palResultRoot.getData();
+                    if (resultData != null && resultData.size() > 0) {
+                        for(DcSemiOrder semiOrder : resultData) {
                             DcSemiOrderMapper mapper = SessionUtil.getSession().getMapper(DcSemiOrderMapper.class);
                             mapper.upsertSelective(semiOrder);
                         }
-
+                    }else{
+                        break;
                     }
                 } else {
                     throw new RuntimeException("调用流水接口同步百伦流水失败, 响应200, 请求参数" + map.toString());
@@ -76,22 +73,10 @@ public class SemiOrderSyncJob extends PointJob {
             } else {
                 throw new RuntimeException("调用流水接口同步百伦流水失败, 响应为null, 请求参数" + map.toString());
             }
-            if (jobPointLog.getPageIndex() % 10 == 0) {
-                try {
-                    JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
-                    mapper.upsertSelective(jobPointLog);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    throw new RuntimeException("Mybatis操作DB插入任务记录失败", e);
-                } finally {
-                    SessionUtil.closeSession();
-                }
-            }
-            jobPointLog.setPageIndex(jobPointLog.getPageIndex() - 1);
-        } while (0 < jobPointLog.getPageIndex());
+            jobPointLog.setPageIndex(jobPointLog.getPageIndex() + 1);
+        } while (true);
         jobPointLog.setPageIndex(0);
         jobPointLog.setStartTime(jobPointLog.getEndTime());
         jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()));
-
     }
 }

data-base/base-sync-semi-order/src/main/resources/const.properties

-SEMI_ORDER_URL=http://api.mjplan.bailuntec.com/api/applyorderlist
-
+SEMI_ORDER_URL=http://mjzz.bailuntec.com/api/ApiOrderApply
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/entity/DcSemiOrder.java

 package com.bailuntec.domain.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -209,11 +208,73 @@ public class DcSemiOrder {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.warehouse_id
+     *
+     * @mbg.generated
+     */
+    private Integer warehouseId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.last_update_date
+     *
+     * @mbg.generated
+     */
+    private LocalDateTime lastUpdateDate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.sku_quantity
+     *
+     * @mbg.generated
+     */
+    private BigDecimal skuQuantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.sku_unit_cost
+     *
+     * @mbg.generated
+     */
+    private BigDecimal skuUnitCost;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.sku_unit_price
+     *
+     * @mbg.generated
+     */
+    private BigDecimal skuUnitPrice;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.sku
+     *
+     * @mbg.generated
+     */
+    private String sku;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_semi_order.warehouse_name
+     *
+     * @mbg.generated
+     */
+    private String warehouseName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_semi_order.semi_order_id
      *
      * @mbg.generated
      */
-    @JSONField(name = "ID")
     private Integer semiOrderId;
 
     /**
@@ -250,6 +311,13 @@ public class DcSemiOrder {
         sb.append(", originalQuantity=").append(originalQuantity);
         sb.append(", toalCostRecord=").append(toalCostRecord);
         sb.append(", toalPriceRecord=").append(toalPriceRecord);
+        sb.append(", warehouseId=").append(warehouseId);
+        sb.append(", lastUpdateDate=").append(lastUpdateDate);
+        sb.append(", skuQuantity=").append(skuQuantity);
+        sb.append(", skuUnitCost=").append(skuUnitCost);
+        sb.append(", skuUnitPrice=").append(skuUnitPrice);
+        sb.append(", sku=").append(sku);
+        sb.append(", warehouseName=").append(warehouseName);
         sb.append(", semiOrderId=").append(semiOrderId);
         sb.append("]");
         return sb.toString();
@@ -295,6 +363,13 @@ public class DcSemiOrder {
             && (this.getOriginalQuantity() == null ? other.getOriginalQuantity() == null : this.getOriginalQuantity().equals(other.getOriginalQuantity()))
             && (this.getToalCostRecord() == null ? other.getToalCostRecord() == null : this.getToalCostRecord().equals(other.getToalCostRecord()))
             && (this.getToalPriceRecord() == null ? other.getToalPriceRecord() == null : this.getToalPriceRecord().equals(other.getToalPriceRecord()))
+            && (this.getWarehouseId() == null ? other.getWarehouseId() == null : this.getWarehouseId().equals(other.getWarehouseId()))
+            && (this.getLastUpdateDate() == null ? other.getLastUpdateDate() == null : this.getLastUpdateDate().equals(other.getLastUpdateDate()))
+            && (this.getSkuQuantity() == null ? other.getSkuQuantity() == null : this.getSkuQuantity().equals(other.getSkuQuantity()))
+            && (this.getSkuUnitCost() == null ? other.getSkuUnitCost() == null : this.getSkuUnitCost().equals(other.getSkuUnitCost()))
+            && (this.getSkuUnitPrice() == null ? other.getSkuUnitPrice() == null : this.getSkuUnitPrice().equals(other.getSkuUnitPrice()))
+            && (this.getSku() == null ? other.getSku() == null : this.getSku().equals(other.getSku()))
+            && (this.getWarehouseName() == null ? other.getWarehouseName() == null : this.getWarehouseName().equals(other.getWarehouseName()))
             && (this.getSemiOrderId() == null ? other.getSemiOrderId() == null : this.getSemiOrderId().equals(other.getSemiOrderId()));
     }
 
@@ -330,6 +405,13 @@ public class DcSemiOrder {
         result = prime * result + ((getOriginalQuantity() == null) ? 0 : getOriginalQuantity().hashCode());
         result = prime * result + ((getToalCostRecord() == null) ? 0 : getToalCostRecord().hashCode());
         result = prime * result + ((getToalPriceRecord() == null) ? 0 : getToalPriceRecord().hashCode());
+        result = prime * result + ((getWarehouseId() == null) ? 0 : getWarehouseId().hashCode());
+        result = prime * result + ((getLastUpdateDate() == null) ? 0 : getLastUpdateDate().hashCode());
+        result = prime * result + ((getSkuQuantity() == null) ? 0 : getSkuQuantity().hashCode());
+        result = prime * result + ((getSkuUnitCost() == null) ? 0 : getSkuUnitCost().hashCode());
+        result = prime * result + ((getSkuUnitPrice() == null) ? 0 : getSkuUnitPrice().hashCode());
+        result = prime * result + ((getSku() == null) ? 0 : getSku().hashCode());
+        result = prime * result + ((getWarehouseName() == null) ? 0 : getWarehouseName().hashCode());
         result = prime * result + ((getSemiOrderId() == null) ? 0 : getSemiOrderId().hashCode());
         return result;
     }

data-common/src/main/java/com/bailuntec/domain/example/DcSemiOrderExample.java

@@ -1761,6 +1761,446 @@ public class DcSemiOrderExample {
             return (Criteria) this;
         }
 
+        public Criteria andWarehouseIdIsNull() {
+            addCriterion("warehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNotNull() {
+            addCriterion("warehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdEqualTo(Integer value) {
+            addCriterion("warehouse_id =", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+            addCriterion("warehouse_id <>", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThan(Integer value) {
+            addCriterion("warehouse_id >", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id >=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThan(Integer value) {
+            addCriterion("warehouse_id <", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id <=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIn(List<Integer> values) {
+            addCriterion("warehouse_id in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+            addCriterion("warehouse_id not in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateIsNull() {
+            addCriterion("last_update_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateIsNotNull() {
+            addCriterion("last_update_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateEqualTo(LocalDateTime value) {
+            addCriterion("last_update_date =", value, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateNotEqualTo(LocalDateTime value) {
+            addCriterion("last_update_date <>", value, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateGreaterThan(LocalDateTime value) {
+            addCriterion("last_update_date >", value, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateGreaterThanOrEqualTo(LocalDateTime value) {
+            addCriterion("last_update_date >=", value, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateLessThan(LocalDateTime value) {
+            addCriterion("last_update_date <", value, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateLessThanOrEqualTo(LocalDateTime value) {
+            addCriterion("last_update_date <=", value, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateIn(List<LocalDateTime> values) {
+            addCriterion("last_update_date in", values, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateNotIn(List<LocalDateTime> values) {
+            addCriterion("last_update_date not in", values, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("last_update_date between", value1, value2, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastUpdateDateNotBetween(LocalDateTime value1, LocalDateTime value2) {
+            addCriterion("last_update_date not between", value1, value2, "lastUpdateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityIsNull() {
+            addCriterion("sku_quantity is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityIsNotNull() {
+            addCriterion("sku_quantity is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityEqualTo(BigDecimal value) {
+            addCriterion("sku_quantity =", value, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityNotEqualTo(BigDecimal value) {
+            addCriterion("sku_quantity <>", value, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityGreaterThan(BigDecimal value) {
+            addCriterion("sku_quantity >", value, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("sku_quantity >=", value, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityLessThan(BigDecimal value) {
+            addCriterion("sku_quantity <", value, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("sku_quantity <=", value, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityIn(List<BigDecimal> values) {
+            addCriterion("sku_quantity in", values, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityNotIn(List<BigDecimal> values) {
+            addCriterion("sku_quantity not in", values, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("sku_quantity between", value1, value2, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuQuantityNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("sku_quantity not between", value1, value2, "skuQuantity");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostIsNull() {
+            addCriterion("sku_unit_cost is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostIsNotNull() {
+            addCriterion("sku_unit_cost is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_cost =", value, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostNotEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_cost <>", value, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostGreaterThan(BigDecimal value) {
+            addCriterion("sku_unit_cost >", value, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_cost >=", value, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostLessThan(BigDecimal value) {
+            addCriterion("sku_unit_cost <", value, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_cost <=", value, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostIn(List<BigDecimal> values) {
+            addCriterion("sku_unit_cost in", values, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostNotIn(List<BigDecimal> values) {
+            addCriterion("sku_unit_cost not in", values, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("sku_unit_cost between", value1, value2, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitCostNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("sku_unit_cost not between", value1, value2, "skuUnitCost");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceIsNull() {
+            addCriterion("sku_unit_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceIsNotNull() {
+            addCriterion("sku_unit_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_price =", value, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceNotEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_price <>", value, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceGreaterThan(BigDecimal value) {
+            addCriterion("sku_unit_price >", value, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_price >=", value, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceLessThan(BigDecimal value) {
+            addCriterion("sku_unit_price <", value, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("sku_unit_price <=", value, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceIn(List<BigDecimal> values) {
+            addCriterion("sku_unit_price in", values, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceNotIn(List<BigDecimal> values) {
+            addCriterion("sku_unit_price not in", values, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("sku_unit_price between", value1, value2, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("sku_unit_price not between", value1, value2, "skuUnitPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuIsNull() {
+            addCriterion("sku is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuIsNotNull() {
+            addCriterion("sku is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuEqualTo(String value) {
+            addCriterion("sku =", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuNotEqualTo(String value) {
+            addCriterion("sku <>", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuGreaterThan(String value) {
+            addCriterion("sku >", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuGreaterThanOrEqualTo(String value) {
+            addCriterion("sku >=", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuLessThan(String value) {
+            addCriterion("sku <", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuLessThanOrEqualTo(String value) {
+            addCriterion("sku <=", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuLike(String value) {
+            addCriterion("sku like", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuNotLike(String value) {
+            addCriterion("sku not like", value, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuIn(List<String> values) {
+            addCriterion("sku in", values, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuNotIn(List<String> values) {
+            addCriterion("sku not in", values, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuBetween(String value1, String value2) {
+            addCriterion("sku between", value1, value2, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuNotBetween(String value1, String value2) {
+            addCriterion("sku not between", value1, value2, "sku");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameIsNull() {
+            addCriterion("warehouse_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameIsNotNull() {
+            addCriterion("warehouse_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameEqualTo(String value) {
+            addCriterion("warehouse_name =", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotEqualTo(String value) {
+            addCriterion("warehouse_name <>", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameGreaterThan(String value) {
+            addCriterion("warehouse_name >", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameGreaterThanOrEqualTo(String value) {
+            addCriterion("warehouse_name >=", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameLessThan(String value) {
+            addCriterion("warehouse_name <", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameLessThanOrEqualTo(String value) {
+            addCriterion("warehouse_name <=", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameLike(String value) {
+            addCriterion("warehouse_name like", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotLike(String value) {
+            addCriterion("warehouse_name not like", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameIn(List<String> values) {
+            addCriterion("warehouse_name in", values, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotIn(List<String> values) {
+            addCriterion("warehouse_name not in", values, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameBetween(String value1, String value2) {
+            addCriterion("warehouse_name between", value1, value2, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotBetween(String value1, String value2) {
+            addCriterion("warehouse_name not between", value1, value2, "warehouseName");
+            return (Criteria) this;
+        }
+
         public Criteria andSemiOrderIdIsNull() {
             addCriterion("semi_order_id is null");
             return (Criteria) this;

data-common/src/main/java/com/bailuntec/mapper/DcSemiOrderMapper.xml

@@ -28,6 +28,13 @@
     <result column="original_quantity" jdbcType="INTEGER" property="originalQuantity" />
     <result column="toal_cost_record" jdbcType="DECIMAL" property="toalCostRecord" />
     <result column="toal_price_record" jdbcType="DECIMAL" property="toalPriceRecord" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="last_update_date" jdbcType="TIMESTAMP" property="lastUpdateDate" />
+    <result column="sku_quantity" jdbcType="DECIMAL" property="skuQuantity" />
+    <result column="sku_unit_cost" jdbcType="DECIMAL" property="skuUnitCost" />
+    <result column="sku_unit_price" jdbcType="DECIMAL" property="skuUnitPrice" />
+    <result column="sku" jdbcType="VARCHAR" property="sku" />
+    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
     <result column="semi_order_id" jdbcType="INTEGER" property="semiOrderId" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -104,7 +111,8 @@
     id, order_no, purchase_no, source, create_date, create_user_name, deliver_date, sale_user, 
     purchase_user, type, company_id, state, delivery_state, total, init_deliver_date, 
     order_type, delivery_remarks, packRemarks, pay_type, original_quantity, toal_cost_record, 
-    toal_price_record, semi_order_id
+    toal_price_record, warehouse_id, last_update_date, sku_quantity, sku_unit_cost, sku_unit_price, 
+    sku, warehouse_name, semi_order_id
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcSemiOrderExample" resultMap="BaseResultMap">
     <!--
@@ -172,7 +180,10 @@
       delivery_state, total, init_deliver_date, 
       order_type, delivery_remarks, packRemarks, 
       pay_type, original_quantity, toal_cost_record, 
-      toal_price_record, semi_order_id)
+      toal_price_record, warehouse_id, last_update_date, 
+      sku_quantity, sku_unit_cost, sku_unit_price, 
+      sku, warehouse_name, semi_order_id
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{purchaseNo,jdbcType=VARCHAR}, 
       #{source,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{createUserName,jdbcType=VARCHAR}, 
       #{deliverDate,jdbcType=TIMESTAMP}, #{saleUser,jdbcType=VARCHAR}, #{purchaseUser,jdbcType=VARCHAR}, 
@@ -180,7 +191,10 @@
       #{deliveryState,jdbcType=INTEGER}, #{total,jdbcType=INTEGER}, #{initDeliverDate,jdbcType=TIMESTAMP}, 
       #{orderType,jdbcType=INTEGER}, #{deliveryRemarks,jdbcType=VARCHAR}, #{packremarks,jdbcType=VARCHAR}, 
       #{payType,jdbcType=INTEGER}, #{originalQuantity,jdbcType=INTEGER}, #{toalCostRecord,jdbcType=DECIMAL}, 
-      #{toalPriceRecord,jdbcType=DECIMAL}, #{semiOrderId,jdbcType=INTEGER})
+      #{toalPriceRecord,jdbcType=DECIMAL}, #{warehouseId,jdbcType=INTEGER}, #{lastUpdateDate,jdbcType=TIMESTAMP}, 
+      #{skuQuantity,jdbcType=DECIMAL}, #{skuUnitCost,jdbcType=DECIMAL}, #{skuUnitPrice,jdbcType=DECIMAL}, 
+      #{sku,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{semiOrderId,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcSemiOrder">
     <!--
@@ -255,6 +269,27 @@
       <if test="toalPriceRecord != null">
         toal_price_record,
       </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="lastUpdateDate != null">
+        last_update_date,
+      </if>
+      <if test="skuQuantity != null">
+        sku_quantity,
+      </if>
+      <if test="skuUnitCost != null">
+        sku_unit_cost,
+      </if>
+      <if test="skuUnitPrice != null">
+        sku_unit_price,
+      </if>
+      <if test="sku != null">
+        sku,
+      </if>
+      <if test="warehouseName != null">
+        warehouse_name,
+      </if>
       <if test="semiOrderId != null">
         semi_order_id,
       </if>
@@ -326,6 +361,27 @@
       <if test="toalPriceRecord != null">
         #{toalPriceRecord,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lastUpdateDate != null">
+        #{lastUpdateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="skuQuantity != null">
+        #{skuQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitCost != null">
+        #{skuUnitCost,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitPrice != null">
+        #{skuUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="sku != null">
+        #{sku,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null">
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="semiOrderId != null">
         #{semiOrderId,jdbcType=INTEGER},
       </if>
@@ -414,6 +470,27 @@
       <if test="record.toalPriceRecord != null">
         toal_price_record = #{record.toalPriceRecord,jdbcType=DECIMAL},
       </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lastUpdateDate != null">
+        last_update_date = #{record.lastUpdateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.skuQuantity != null">
+        sku_quantity = #{record.skuQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="record.skuUnitCost != null">
+        sku_unit_cost = #{record.skuUnitCost,jdbcType=DECIMAL},
+      </if>
+      <if test="record.skuUnitPrice != null">
+        sku_unit_price = #{record.skuUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.sku != null">
+        sku = #{record.sku,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseName != null">
+        warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="record.semiOrderId != null">
         semi_order_id = #{record.semiOrderId,jdbcType=INTEGER},
       </if>
@@ -450,6 +527,13 @@
       original_quantity = #{record.originalQuantity,jdbcType=INTEGER},
       toal_cost_record = #{record.toalCostRecord,jdbcType=DECIMAL},
       toal_price_record = #{record.toalPriceRecord,jdbcType=DECIMAL},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      last_update_date = #{record.lastUpdateDate,jdbcType=TIMESTAMP},
+      sku_quantity = #{record.skuQuantity,jdbcType=DECIMAL},
+      sku_unit_cost = #{record.skuUnitCost,jdbcType=DECIMAL},
+      sku_unit_price = #{record.skuUnitPrice,jdbcType=DECIMAL},
+      sku = #{record.sku,jdbcType=VARCHAR},
+      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
       semi_order_id = #{record.semiOrderId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -525,6 +609,27 @@
       <if test="toalPriceRecord != null">
         toal_price_record = #{toalPriceRecord,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lastUpdateDate != null">
+        last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="skuQuantity != null">
+        sku_quantity = #{skuQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitCost != null">
+        sku_unit_cost = #{skuUnitCost,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitPrice != null">
+        sku_unit_price = #{skuUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="sku != null">
+        sku = #{sku,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null">
+        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="semiOrderId != null">
         semi_order_id = #{semiOrderId,jdbcType=INTEGER},
       </if>
@@ -558,6 +663,13 @@
       original_quantity = #{originalQuantity,jdbcType=INTEGER},
       toal_cost_record = #{toalCostRecord,jdbcType=DECIMAL},
       toal_price_record = #{toalPriceRecord,jdbcType=DECIMAL},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP},
+      sku_quantity = #{skuQuantity,jdbcType=DECIMAL},
+      sku_unit_cost = #{skuUnitCost,jdbcType=DECIMAL},
+      sku_unit_price = #{skuUnitPrice,jdbcType=DECIMAL},
+      sku = #{sku,jdbcType=VARCHAR},
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
       semi_order_id = #{semiOrderId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -635,6 +747,27 @@
       <if test="toalPriceRecord != null">
         toal_price_record,
       </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="lastUpdateDate != null">
+        last_update_date,
+      </if>
+      <if test="skuQuantity != null">
+        sku_quantity,
+      </if>
+      <if test="skuUnitCost != null">
+        sku_unit_cost,
+      </if>
+      <if test="skuUnitPrice != null">
+        sku_unit_price,
+      </if>
+      <if test="sku != null">
+        sku,
+      </if>
+      <if test="warehouseName != null">
+        warehouse_name,
+      </if>
       <if test="semiOrderId != null">
         semi_order_id,
       </if>
@@ -707,6 +840,27 @@
       <if test="toalPriceRecord != null">
         #{toalPriceRecord,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lastUpdateDate != null">
+        #{lastUpdateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="skuQuantity != null">
+        #{skuQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitCost != null">
+        #{skuUnitCost,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitPrice != null">
+        #{skuUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="sku != null">
+        #{sku,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null">
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="semiOrderId != null">
         #{semiOrderId,jdbcType=INTEGER},
       </if>
@@ -779,6 +933,27 @@
       <if test="toalPriceRecord != null">
         toal_price_record = #{toalPriceRecord,jdbcType=DECIMAL},
       </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lastUpdateDate != null">
+        last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="skuQuantity != null">
+        sku_quantity = #{skuQuantity,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitCost != null">
+        sku_unit_cost = #{skuUnitCost,jdbcType=DECIMAL},
+      </if>
+      <if test="skuUnitPrice != null">
+        sku_unit_price = #{skuUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="sku != null">
+        sku = #{sku,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null">
+        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      </if>
       <if test="semiOrderId != null">
         semi_order_id = #{semiOrderId,jdbcType=INTEGER},
       </if>
@@ -794,7 +969,8 @@
     (id, order_no, purchase_no, source, create_date, create_user_name, deliver_date, 
       sale_user, purchase_user, type, company_id, state, delivery_state, total, init_deliver_date, 
       order_type, delivery_remarks, packRemarks, pay_type, original_quantity, toal_cost_record, 
-      toal_price_record, semi_order_id)
+      toal_price_record, warehouse_id, last_update_date, sku_quantity, sku_unit_cost, 
+      sku_unit_price, sku, warehouse_name, semi_order_id)
     values
     (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{purchaseNo,jdbcType=VARCHAR}, 
       #{source,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{createUserName,jdbcType=VARCHAR}, 
@@ -803,7 +979,10 @@
       #{deliveryState,jdbcType=INTEGER}, #{total,jdbcType=INTEGER}, #{initDeliverDate,jdbcType=TIMESTAMP}, 
       #{orderType,jdbcType=INTEGER}, #{deliveryRemarks,jdbcType=VARCHAR}, #{packremarks,jdbcType=VARCHAR}, 
       #{payType,jdbcType=INTEGER}, #{originalQuantity,jdbcType=INTEGER}, #{toalCostRecord,jdbcType=DECIMAL}, 
-      #{toalPriceRecord,jdbcType=DECIMAL}, #{semiOrderId,jdbcType=INTEGER})
+      #{toalPriceRecord,jdbcType=DECIMAL}, #{warehouseId,jdbcType=INTEGER}, #{lastUpdateDate,jdbcType=TIMESTAMP}, 
+      #{skuQuantity,jdbcType=DECIMAL}, #{skuUnitCost,jdbcType=DECIMAL}, #{skuUnitPrice,jdbcType=DECIMAL}, 
+      #{sku,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{semiOrderId,jdbcType=INTEGER}
+      )
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     order_no = #{orderNo,jdbcType=VARCHAR}, 
@@ -827,6 +1006,13 @@
     original_quantity = #{originalQuantity,jdbcType=INTEGER}, 
     toal_cost_record = #{toalCostRecord,jdbcType=DECIMAL}, 
     toal_price_record = #{toalPriceRecord,jdbcType=DECIMAL}, 
+    warehouse_id = #{warehouseId,jdbcType=INTEGER}, 
+    last_update_date = #{lastUpdateDate,jdbcType=TIMESTAMP}, 
+    sku_quantity = #{skuQuantity,jdbcType=DECIMAL}, 
+    sku_unit_cost = #{skuUnitCost,jdbcType=DECIMAL}, 
+    sku_unit_price = #{skuUnitPrice,jdbcType=DECIMAL}, 
+    sku = #{sku,jdbcType=VARCHAR}, 
+    warehouse_name = #{warehouseName,jdbcType=VARCHAR}, 
     semi_order_id = #{semiOrderId,jdbcType=INTEGER}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcSemiOrderExample" resultMap="BaseResultMap">