自动周转新增一些SKU字段

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

@@ -503,6 +503,51 @@ public class DcAutoTurnover {
     private Integer paymentBeforeDelivery;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.product_code
+     *
+     * @mbg.generated
+     */
+    private String productCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.product_inner_code
+     *
+     * @mbg.generated
+     */
+    private String productInnerCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.bailun_category_id
+     *
+     * @mbg.generated
+     */
+    private Integer bailunCategoryId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.buyer_name
+     *
+     * @mbg.generated
+     */
+    private String buyerName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_auto_turnover.suppliers_name
+     *
+     * @mbg.generated
+     */
+    private String suppliersName;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_auto_turnover
      *
@@ -569,6 +614,11 @@ public class DcAutoTurnover {
         sb.append(", quantityBeginAdvise=").append(quantityBeginAdvise);
         sb.append(", stockUpDays=").append(stockUpDays);
         sb.append(", paymentBeforeDelivery=").append(paymentBeforeDelivery);
+        sb.append(", productCode=").append(productCode);
+        sb.append(", productInnerCode=").append(productInnerCode);
+        sb.append(", bailunCategoryId=").append(bailunCategoryId);
+        sb.append(", buyerName=").append(buyerName);
+        sb.append(", suppliersName=").append(suppliersName);
         sb.append("]");
         return sb.toString();
     }
@@ -645,7 +695,12 @@ public class DcAutoTurnover {
             && (this.getStockUpSales() == null ? other.getStockUpSales() == null : this.getStockUpSales().equals(other.getStockUpSales()))
             && (this.getQuantityBeginAdvise() == null ? other.getQuantityBeginAdvise() == null : this.getQuantityBeginAdvise().equals(other.getQuantityBeginAdvise()))
             && (this.getStockUpDays() == null ? other.getStockUpDays() == null : this.getStockUpDays().equals(other.getStockUpDays()))
-            && (this.getPaymentBeforeDelivery() == null ? other.getPaymentBeforeDelivery() == null : this.getPaymentBeforeDelivery().equals(other.getPaymentBeforeDelivery()));
+            && (this.getPaymentBeforeDelivery() == null ? other.getPaymentBeforeDelivery() == null : this.getPaymentBeforeDelivery().equals(other.getPaymentBeforeDelivery()))
+            && (this.getProductCode() == null ? other.getProductCode() == null : this.getProductCode().equals(other.getProductCode()))
+            && (this.getProductInnerCode() == null ? other.getProductInnerCode() == null : this.getProductInnerCode().equals(other.getProductInnerCode()))
+            && (this.getBailunCategoryId() == null ? other.getBailunCategoryId() == null : this.getBailunCategoryId().equals(other.getBailunCategoryId()))
+            && (this.getBuyerName() == null ? other.getBuyerName() == null : this.getBuyerName().equals(other.getBuyerName()))
+            && (this.getSuppliersName() == null ? other.getSuppliersName() == null : this.getSuppliersName().equals(other.getSuppliersName()));
     }
 
     /**
@@ -713,6 +768,11 @@ public class DcAutoTurnover {
         result = prime * result + ((getQuantityBeginAdvise() == null) ? 0 : getQuantityBeginAdvise().hashCode());
         result = prime * result + ((getStockUpDays() == null) ? 0 : getStockUpDays().hashCode());
         result = prime * result + ((getPaymentBeforeDelivery() == null) ? 0 : getPaymentBeforeDelivery().hashCode());
+        result = prime * result + ((getProductCode() == null) ? 0 : getProductCode().hashCode());
+        result = prime * result + ((getProductInnerCode() == null) ? 0 : getProductInnerCode().hashCode());
+        result = prime * result + ((getBailunCategoryId() == null) ? 0 : getBailunCategoryId().hashCode());
+        result = prime * result + ((getBuyerName() == null) ? 0 : getBuyerName().hashCode());
+        result = prime * result + ((getSuppliersName() == null) ? 0 : getSuppliersName().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -304,6 +304,33 @@ public class DcBaseStock {
     private Integer shippedStock;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_stock.sku_title_cn
+     *
+     * @mbg.generated
+     */
+    private String skuTitleCn;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_stock.product_inner_code
+     *
+     * @mbg.generated
+     */
+    private String productInnerCode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_stock.suppliers_name
+     *
+     * @mbg.generated
+     */
+    private String suppliersName;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_stock
      *
@@ -348,6 +375,9 @@ public class DcBaseStock {
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", shippedStock=").append(shippedStock);
+        sb.append(", skuTitleCn=").append(skuTitleCn);
+        sb.append(", productInnerCode=").append(productInnerCode);
+        sb.append(", suppliersName=").append(suppliersName);
         sb.append("]");
         return sb.toString();
     }
@@ -402,7 +432,10 @@ public class DcBaseStock {
             && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
-            && (this.getShippedStock() == null ? other.getShippedStock() == null : this.getShippedStock().equals(other.getShippedStock()));
+            && (this.getShippedStock() == null ? other.getShippedStock() == null : this.getShippedStock().equals(other.getShippedStock()))
+            && (this.getSkuTitleCn() == null ? other.getSkuTitleCn() == null : this.getSkuTitleCn().equals(other.getSkuTitleCn()))
+            && (this.getProductInnerCode() == null ? other.getProductInnerCode() == null : this.getProductInnerCode().equals(other.getProductInnerCode()))
+            && (this.getSuppliersName() == null ? other.getSuppliersName() == null : this.getSuppliersName().equals(other.getSuppliersName()));
     }
 
     /**
@@ -448,6 +481,9 @@ public class DcBaseStock {
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
         result = prime * result + ((getShippedStock() == null) ? 0 : getShippedStock().hashCode());
+        result = prime * result + ((getSkuTitleCn() == null) ? 0 : getSkuTitleCn().hashCode());
+        result = prime * result + ((getProductInnerCode() == null) ? 0 : getProductInnerCode().hashCode());
+        result = prime * result + ((getSuppliersName() == null) ? 0 : getSuppliersName().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -2379,6 +2379,216 @@ public class DcBaseStockExample {
             addCriterion("shipped_stock not between", value1, value2, "shippedStock");
             return (Criteria) this;
         }
+
+        public Criteria andSkuTitleCnIsNull() {
+            addCriterion("sku_title_cn is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnIsNotNull() {
+            addCriterion("sku_title_cn is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnEqualTo(String value) {
+            addCriterion("sku_title_cn =", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnNotEqualTo(String value) {
+            addCriterion("sku_title_cn <>", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnGreaterThan(String value) {
+            addCriterion("sku_title_cn >", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnGreaterThanOrEqualTo(String value) {
+            addCriterion("sku_title_cn >=", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnLessThan(String value) {
+            addCriterion("sku_title_cn <", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnLessThanOrEqualTo(String value) {
+            addCriterion("sku_title_cn <=", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnLike(String value) {
+            addCriterion("sku_title_cn like", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnNotLike(String value) {
+            addCriterion("sku_title_cn not like", value, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnIn(List<String> values) {
+            addCriterion("sku_title_cn in", values, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnNotIn(List<String> values) {
+            addCriterion("sku_title_cn not in", values, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnBetween(String value1, String value2) {
+            addCriterion("sku_title_cn between", value1, value2, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andSkuTitleCnNotBetween(String value1, String value2) {
+            addCriterion("sku_title_cn not between", value1, value2, "skuTitleCn");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeIsNull() {
+            addCriterion("product_inner_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeIsNotNull() {
+            addCriterion("product_inner_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeEqualTo(String value) {
+            addCriterion("product_inner_code =", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeNotEqualTo(String value) {
+            addCriterion("product_inner_code <>", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeGreaterThan(String value) {
+            addCriterion("product_inner_code >", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("product_inner_code >=", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeLessThan(String value) {
+            addCriterion("product_inner_code <", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeLessThanOrEqualTo(String value) {
+            addCriterion("product_inner_code <=", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeLike(String value) {
+            addCriterion("product_inner_code like", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeNotLike(String value) {
+            addCriterion("product_inner_code not like", value, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeIn(List<String> values) {
+            addCriterion("product_inner_code in", values, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeNotIn(List<String> values) {
+            addCriterion("product_inner_code not in", values, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeBetween(String value1, String value2) {
+            addCriterion("product_inner_code between", value1, value2, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductInnerCodeNotBetween(String value1, String value2) {
+            addCriterion("product_inner_code not between", value1, value2, "productInnerCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameIsNull() {
+            addCriterion("suppliers_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameIsNotNull() {
+            addCriterion("suppliers_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameEqualTo(String value) {
+            addCriterion("suppliers_name =", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameNotEqualTo(String value) {
+            addCriterion("suppliers_name <>", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameGreaterThan(String value) {
+            addCriterion("suppliers_name >", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameGreaterThanOrEqualTo(String value) {
+            addCriterion("suppliers_name >=", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameLessThan(String value) {
+            addCriterion("suppliers_name <", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameLessThanOrEqualTo(String value) {
+            addCriterion("suppliers_name <=", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameLike(String value) {
+            addCriterion("suppliers_name like", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameNotLike(String value) {
+            addCriterion("suppliers_name not like", value, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameIn(List<String> values) {
+            addCriterion("suppliers_name in", values, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameNotIn(List<String> values) {
+            addCriterion("suppliers_name not in", values, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameBetween(String value1, String value2) {
+            addCriterion("suppliers_name between", value1, value2, "suppliersName");
+            return (Criteria) this;
+        }
+
+        public Criteria andSuppliersNameNotBetween(String value1, String value2) {
+            addCriterion("suppliers_name not between", value1, value2, "suppliersName");
+            return (Criteria) this;
+        }
     }
 
     /**

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -435,6 +435,12 @@ public class AutoTurnoverJob extends PointJob {
                 stockUpSales = stockUpSales.add(forecastSalesList.get(i + 1 + turnoverDays));
             }
         }
+
+        dcAutoTurnover.setSuppliersName(turnoverSku.getSuppliersName());
+        dcAutoTurnover.setBuyerName(turnoverSku.getBuyerName());
+        dcAutoTurnover.setBailunCategoryId(turnoverSku.getBailunCategoryId());
+        dcAutoTurnover.setProductCode(turnoverSku.getProductCode());
+        dcAutoTurnover.setProductInnerCode(turnoverSku.getProductInnerCode());
         dcAutoTurnover.setPaymentBeforeDelivery(paymentBeforeDelivery);
         dcAutoTurnover.setStockUpDays(stockUpDays);
         dcAutoTurnover.setStockUpSales(stockUpSales);
@@ -475,12 +481,18 @@ public class AutoTurnoverJob extends PointJob {
         dcAutoTurnover.setStatus(forecastShortSupplyList.get(2 * turnoverDays.intValue()).intValue() > 0 ? 1 : 0);
         dcAutoTurnover.setTurnoverDays(turnoverDays);
         dcAutoTurnover.setQuantitySafeInventory(safeInventory);
+
+        dcBaseStock.setSkuTitleCn(turnoverSku.getSkuTitleCn());
+        dcBaseStock.setProductInnerCode(turnoverSku.getProductInnerCode());
+        dcBaseStock.setSuppliersName(turnoverSku.getSuppliersName());
         try {
             DcAutoTurnoverMapper autoTurnoverMapper = SessionUtil.getSession().getMapper(DcAutoTurnoverMapper.class);
+            DcBaseStockMapper dcBaseStockMapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
             int i = autoTurnoverMapper.updateByExampleSelective(dcAutoTurnover, DcAutoTurnoverExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoTurnover.getBailunSku()).andWarehouseCodeEqualTo(dcAutoTurnover.getWarehouseCode()).example());
             if (i == 0) {
                 autoTurnoverMapper.insertSelective(dcAutoTurnover);
             }
+            dcBaseStockMapper.updateByExampleSelective(dcBaseStock, DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoTurnover.getBailunSku()).andWarehouseCodeEqualTo(dcAutoTurnover.getWarehouseCode()).example());
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("Mybatis操作DB失败", e);
@@ -724,7 +736,7 @@ public class AutoTurnoverJob extends PointJob {
                 dcBasePurchaseList = dcBasePurchaseMapper.listPurchaseTransitOrder(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
             } catch (Exception e) {
                 e.printStackTrace();
-                throw new RuntimeException("Mybatis操作DB查询失败");
+                throw new RuntimeException("Mybatis操作DB查询采购单流水失败");
             } finally {
                 SessionUtil.closeSession();
             }
@@ -755,7 +767,7 @@ public class AutoTurnoverJob extends PointJob {
                 dcBaseTransferVerifyList = dcBaseTransferVerifyMapper.listTransferTransitOrder(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode());
             } catch (Exception e) {
                 e.printStackTrace();
-                throw new RuntimeException("Mybatis操作DB查询失败");
+                throw new RuntimeException("Mybatis操作DB查询调拨单流水失败");
             } finally {
                 SessionUtil.closeSession();
             }
@@ -790,7 +802,7 @@ public class AutoTurnoverJob extends PointJob {
             autoSalesConfigList = dcAutoConfigPromotionMapper.selectByExample(DcAutoConfigPromotionExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoSales.getBailunSku()).andWarehouseCodeEqualTo(dcAutoSales.getWarehouseCode()).andPromotionTimeBetween(recordTime, recordTime.plusDays(autoForecastDay.longValue())).example());
         } catch (Exception e) {
             e.printStackTrace();
-            throw new RuntimeException("Mybatis操作DB查询失败");
+            throw new RuntimeException("Mybatis操作DB查询周转周期里活动失败");
         } finally {
             SessionUtil.closeSession();
         }
@@ -855,7 +867,7 @@ public class AutoTurnoverJob extends PointJob {
             configCorrectionList = autoConfigCorrectionMapper.selectByExample(DcAutoConfigCorrectionExample.newAndCreateCriteria().andBailunSkuEqualTo(dcAutoSales.getBailunSku()).andWarehouseCodeEqualTo(dcAutoSales.getWarehouseCode()).andStartTimeGreaterThanOrEqualTo(recordTime).example());
         } catch (Exception e) {
             e.printStackTrace();
-            throw new RuntimeException("Mybatis操作DB查询失败");
+            throw new RuntimeException("Mybatis操作DB查询矫正曲线配置失败");
         } finally {
             SessionUtil.closeSession();
         }

data-show/show-auto-turnover/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.java

@@ -122,6 +122,7 @@ public interface DcAutoTurnoverMapper {
      */
     int upsertSelective(DcAutoTurnover record);
 
+
     void truncateAutoInboundTable();
 
     void truncateAutoInventoryTable();

data-show/show-auto-turnover/src/main/java/com/bailuntec/mapper/DcBaseStockMapper.java

@@ -122,10 +122,10 @@ public interface DcBaseStockMapper {
      */
     int upsertSelective(DcBaseStock record);
 
+
     List<DcBaseStock> listNoChinaWarehouse(@Param("v1") int v1, @Param("v2") int v2);
 
     List<DcBaseStock> listOrderByFba(@Param("v1") int v1, @Param("v2") int v2);
 
     List<DcBaseStock> listInStockNotInAutoTurnover();
-
 }
\ No newline at end of file

data-show/show-auto-turnover/src/test/java/AutoTurnoverTest.java

@@ -50,6 +50,8 @@ public class AutoTurnoverTest {
         try {
             DcBaseStockMapper mapper = SessionUtil.getSession().getMapper(DcBaseStockMapper.class);
 //            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("322572421").andWarehouseCodeEqualTo("QYBLZZ").example());
+//            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("232232601").andWarehouseCodeEqualTo("CHUKFBA").example());
+            dcBaseStock = mapper.selectOneByExample(DcBaseStockExample.newAndCreateCriteria().andBailunSkuEqualTo("227290401").andWarehouseCodeEqualTo("GZBLWH").example());
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

mybatis-generator/src/main/resources/init.properties

-table-name=dc_daily_sales
+table-name=dc_base_stock