Skip to content

D
dc-java
Commit 3265627f by wutong
Options

自动周转新增一些SKU字段

parent 4b62b2e6
Showing with 930 additions and 25 deletions
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/DcAutoTurnoverExample.java
......@@ -3800,6 +3800,346 @@ public class DcAutoTurnoverExample {
addCriterion("payment_before_delivery not between", value1, value2, "paymentBeforeDelivery");
return (Criteria) this;
}
public Criteria andProductCodeIsNull() {
addCriterion("product_code is null");
return (Criteria) this;
}
public Criteria andProductCodeIsNotNull() {
addCriterion("product_code is not null");
return (Criteria) this;
}
public Criteria andProductCodeEqualTo(String value) {
addCriterion("product_code =", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeNotEqualTo(String value) {
addCriterion("product_code <>", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeGreaterThan(String value) {
addCriterion("product_code >", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeGreaterThanOrEqualTo(String value) {
addCriterion("product_code >=", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeLessThan(String value) {
addCriterion("product_code <", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeLessThanOrEqualTo(String value) {
addCriterion("product_code <=", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeLike(String value) {
addCriterion("product_code like", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeNotLike(String value) {
addCriterion("product_code not like", value, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeIn(List<String> values) {
addCriterion("product_code in", values, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeNotIn(List<String> values) {
addCriterion("product_code not in", values, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeBetween(String value1, String value2) {
addCriterion("product_code between", value1, value2, "productCode");
return (Criteria) this;
}
public Criteria andProductCodeNotBetween(String value1, String value2) {
addCriterion("product_code not between", value1, value2, "productCode");
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 andBailunCategoryIdIsNull() {
addCriterion("bailun_category_id is null");
return (Criteria) this;
}
public Criteria andBailunCategoryIdIsNotNull() {
addCriterion("bailun_category_id is not null");
return (Criteria) this;
}
public Criteria andBailunCategoryIdEqualTo(Integer value) {
addCriterion("bailun_category_id =", value, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdNotEqualTo(Integer value) {
addCriterion("bailun_category_id <>", value, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdGreaterThan(Integer value) {
addCriterion("bailun_category_id >", value, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdGreaterThanOrEqualTo(Integer value) {
addCriterion("bailun_category_id >=", value, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdLessThan(Integer value) {
addCriterion("bailun_category_id <", value, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdLessThanOrEqualTo(Integer value) {
addCriterion("bailun_category_id <=", value, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdIn(List<Integer> values) {
addCriterion("bailun_category_id in", values, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdNotIn(List<Integer> values) {
addCriterion("bailun_category_id not in", values, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdBetween(Integer value1, Integer value2) {
addCriterion("bailun_category_id between", value1, value2, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBailunCategoryIdNotBetween(Integer value1, Integer value2) {
addCriterion("bailun_category_id not between", value1, value2, "bailunCategoryId");
return (Criteria) this;
}
public Criteria andBuyerNameIsNull() {
addCriterion("buyer_name is null");
return (Criteria) this;
}
public Criteria andBuyerNameIsNotNull() {
addCriterion("buyer_name is not null");
return (Criteria) this;
}
public Criteria andBuyerNameEqualTo(String value) {
addCriterion("buyer_name =", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameNotEqualTo(String value) {
addCriterion("buyer_name <>", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameGreaterThan(String value) {
addCriterion("buyer_name >", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameGreaterThanOrEqualTo(String value) {
addCriterion("buyer_name >=", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameLessThan(String value) {
addCriterion("buyer_name <", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameLessThanOrEqualTo(String value) {
addCriterion("buyer_name <=", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameLike(String value) {
addCriterion("buyer_name like", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameNotLike(String value) {
addCriterion("buyer_name not like", value, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameIn(List<String> values) {
addCriterion("buyer_name in", values, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameNotIn(List<String> values) {
addCriterion("buyer_name not in", values, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameBetween(String value1, String value2) {
addCriterion("buyer_name between", value1, value2, "buyerName");
return (Criteria) this;
}
public Criteria andBuyerNameNotBetween(String value1, String value2) {
addCriterion("buyer_name not between", value1, value2, "buyerName");
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-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/DcAutoTurnoverMapper.xml
......@@ -61,6 +61,11 @@
<result column="quantity_begin_advise" jdbcType="DECIMAL" property="quantityBeginAdvise" />
<result column="stock_up_days" jdbcType="INTEGER" property="stockUpDays" />
<result column="payment_before_delivery" jdbcType="INTEGER" property="paymentBeforeDelivery" />
<result column="product_code" jdbcType="VARCHAR" property="productCode" />
<result column="product_inner_code" jdbcType="VARCHAR" property="productInnerCode" />
<result column="bailun_category_id" jdbcType="INTEGER" property="bailunCategoryId" />
<result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
<result column="suppliers_name" jdbcType="VARCHAR" property="suppliersName" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -144,7 +149,8 @@
inspection_delivery, transfer_delivery, transfer_bale_delivery, abroad_inbound_delivery,
supplementary_sales, turnover_sales, turnover_inbound, history_sevenday_sales, history_fourteenday_sales,
history_thirtyday_sales, sales_explain_details, forecast_turnoverday_sales, stock_up_sales,
quantity_begin_advise, stock_up_days, payment_before_delivery
quantity_begin_advise, stock_up_days, payment_before_delivery, product_code, product_inner_code,
bailun_category_id, buyer_name, suppliers_name
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!--
......@@ -226,7 +232,9 @@
history_fourteenday_sales, history_thirtyday_sales,
sales_explain_details, forecast_turnoverday_sales,
stock_up_sales, quantity_begin_advise, stock_up_days,
payment_before_delivery)
payment_before_delivery, product_code, product_inner_code,
bailun_category_id, buyer_name, suppliers_name
)
values (#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
#{quantityFinalAdvise,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{quantityPromotion,jdbcType=INTEGER},
......@@ -248,7 +256,9 @@
#{historyFourteendaySales,jdbcType=DECIMAL}, #{historyThirtydaySales,jdbcType=DECIMAL},
#{salesExplainDetails,jdbcType=VARCHAR}, #{forecastTurnoverdaySales,jdbcType=DECIMAL},
#{stockUpSales,jdbcType=DECIMAL}, #{quantityBeginAdvise,jdbcType=DECIMAL}, #{stockUpDays,jdbcType=INTEGER},
#{paymentBeforeDelivery,jdbcType=INTEGER})
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
<!--
......@@ -422,6 +432,21 @@
<if test="paymentBeforeDelivery != null">
payment_before_delivery,
</if>
<if test="productCode != null">
product_code,
</if>
<if test="productInnerCode != null">
product_inner_code,
</if>
<if test="bailunCategoryId != null">
bailun_category_id,
</if>
<if test="buyerName != null">
buyer_name,
</if>
<if test="suppliersName != null">
suppliers_name,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -589,6 +614,21 @@
<if test="paymentBeforeDelivery != null">
#{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
<if test="productCode != null">
#{productCode,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
#{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="bailunCategoryId != null">
#{bailunCategoryId,jdbcType=INTEGER},
</if>
<if test="buyerName != null">
#{buyerName,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
#{suppliersName,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultType="java.lang.Long">
......@@ -773,6 +813,21 @@
<if test="record.paymentBeforeDelivery != null">
payment_before_delivery = #{record.paymentBeforeDelivery,jdbcType=INTEGER},
</if>
<if test="record.productCode != null">
product_code = #{record.productCode,jdbcType=VARCHAR},
</if>
<if test="record.productInnerCode != null">
product_inner_code = #{record.productInnerCode,jdbcType=VARCHAR},
</if>
<if test="record.bailunCategoryId != null">
bailun_category_id = #{record.bailunCategoryId,jdbcType=INTEGER},
</if>
<if test="record.buyerName != null">
buyer_name = #{record.buyerName,jdbcType=VARCHAR},
</if>
<if test="record.suppliersName != null">
suppliers_name = #{record.suppliersName,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -838,7 +893,12 @@
stock_up_sales = #{record.stockUpSales,jdbcType=DECIMAL},
quantity_begin_advise = #{record.quantityBeginAdvise,jdbcType=DECIMAL},
stock_up_days = #{record.stockUpDays,jdbcType=INTEGER},
payment_before_delivery = #{record.paymentBeforeDelivery,jdbcType=INTEGER}
payment_before_delivery = #{record.paymentBeforeDelivery,jdbcType=INTEGER},
product_code = #{record.productCode,jdbcType=VARCHAR},
product_inner_code = #{record.productInnerCode,jdbcType=VARCHAR},
bailun_category_id = #{record.bailunCategoryId,jdbcType=INTEGER},
buyer_name = #{record.buyerName,jdbcType=VARCHAR},
suppliers_name = #{record.suppliersName,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1012,6 +1072,21 @@
<if test="paymentBeforeDelivery != null">
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
<if test="productCode != null">
product_code = #{productCode,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="bailunCategoryId != null">
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
</if>
<if test="buyerName != null">
buyer_name = #{buyerName,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
suppliers_name = #{suppliersName,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1074,7 +1149,12 @@
stock_up_sales = #{stockUpSales,jdbcType=DECIMAL},
quantity_begin_advise = #{quantityBeginAdvise,jdbcType=DECIMAL},
stock_up_days = #{stockUpDays,jdbcType=INTEGER},
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER}
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER},
product_code = #{productCode,jdbcType=VARCHAR},
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
buyer_name = #{buyerName,jdbcType=VARCHAR},
suppliers_name = #{suppliersName,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
......@@ -1250,6 +1330,21 @@
<if test="paymentBeforeDelivery != null">
payment_before_delivery,
</if>
<if test="productCode != null">
product_code,
</if>
<if test="productInnerCode != null">
product_inner_code,
</if>
<if test="bailunCategoryId != null">
bailun_category_id,
</if>
<if test="buyerName != null">
buyer_name,
</if>
<if test="suppliersName != null">
suppliers_name,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -1418,6 +1513,21 @@
<if test="paymentBeforeDelivery != null">
#{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
<if test="productCode != null">
#{productCode,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
#{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="bailunCategoryId != null">
#{bailunCategoryId,jdbcType=INTEGER},
</if>
<if test="buyerName != null">
#{buyerName,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
#{suppliersName,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -1586,6 +1696,21 @@
<if test="paymentBeforeDelivery != null">
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER},
</if>
<if test="productCode != null">
product_code = #{productCode,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="bailunCategoryId != null">
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
</if>
<if test="buyerName != null">
buyer_name = #{buyerName,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
suppliers_name = #{suppliersName,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcAutoTurnover">
......@@ -1607,7 +1732,8 @@
abroad_inbound_delivery, supplementary_sales, turnover_sales, turnover_inbound,
history_sevenday_sales, history_fourteenday_sales, history_thirtyday_sales, sales_explain_details,
forecast_turnoverday_sales, stock_up_sales, quantity_begin_advise, stock_up_days,
payment_before_delivery)
payment_before_delivery, product_code, product_inner_code, bailun_category_id,
buyer_name, suppliers_name)
values
(#{id,jdbcType=INTEGER}, #{purchaseAdviceId,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{warehouseCode,jdbcType=VARCHAR}, #{quantityInitAdvise,jdbcType=DECIMAL}, #{quantityMinimumOrder,jdbcType=INTEGER},
......@@ -1630,7 +1756,9 @@
#{historyFourteendaySales,jdbcType=DECIMAL}, #{historyThirtydaySales,jdbcType=DECIMAL},
#{salesExplainDetails,jdbcType=VARCHAR}, #{forecastTurnoverdaySales,jdbcType=DECIMAL},
#{stockUpSales,jdbcType=DECIMAL}, #{quantityBeginAdvise,jdbcType=DECIMAL}, #{stockUpDays,jdbcType=INTEGER},
#{paymentBeforeDelivery,jdbcType=INTEGER})
#{paymentBeforeDelivery,jdbcType=INTEGER}, #{productCode,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR},
#{bailunCategoryId,jdbcType=INTEGER}, #{buyerName,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
purchase_advice_id = #{purchaseAdviceId,jdbcType=VARCHAR},
......@@ -1686,7 +1814,12 @@
stock_up_sales = #{stockUpSales,jdbcType=DECIMAL},
quantity_begin_advise = #{quantityBeginAdvise,jdbcType=DECIMAL},
stock_up_days = #{stockUpDays,jdbcType=INTEGER},
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER}
payment_before_delivery = #{paymentBeforeDelivery,jdbcType=INTEGER},
product_code = #{productCode,jdbcType=VARCHAR},
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
buyer_name = #{buyerName,jdbcType=VARCHAR},
suppliers_name = #{suppliersName,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcAutoTurnoverExample" resultMap="BaseResultMap">
<!--
......@@ -1706,6 +1839,7 @@
limit 1
</select>
<delete id="truncateAutoInboundTable">
TRUNCATE dc_auto_inbound
</delete>
......
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/main/java/com/bailuntec/mapper/DcBaseStockMapper.xml
......@@ -38,6 +38,10 @@
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="shipped_stock" jdbcType="INTEGER" property="shippedStock" />
<result column="sku_title_cn" jdbcType="VARCHAR" property="skuTitleCn" />
<result column="product_inner_code" jdbcType="VARCHAR" property="productInnerCode" />
<result column="suppliers_name" jdbcType="VARCHAR" property="suppliersName" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -115,7 +119,8 @@
quantity_transit, wait_check, wait_putaway, usable_stock, usable_sales, usable_sales_private,
usable_sales_share, in_warehouse_share, in_warehouse_private, in_warehouse, occupy_stock_share,
occupy_stock_private, occupy_stock, occupy_activity, occupy_order_private, occupy_order_share,
occupy_order, gmt_create, gmt_modified, create_time, update_time
occupy_order, gmt_create, gmt_modified, create_time, update_time, shipped_stock,
sku_title_cn, product_inner_code, suppliers_name
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseStockExample" resultMap="BaseResultMap">
<!--
......@@ -186,7 +191,9 @@
occupy_stock_share, occupy_stock_private, occupy_stock,
occupy_activity, occupy_order_private, occupy_order_share,
occupy_order, gmt_create, gmt_modified,
create_time, update_time)
create_time, update_time, shipped_stock,
sku_title_cn, product_inner_code, suppliers_name
)
values (#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{ownerCode,jdbcType=VARCHAR}, #{quantityReservation,jdbcType=INTEGER}, #{quantityTransport,jdbcType=INTEGER},
#{quantityTransfer,jdbcType=INTEGER}, #{quantityFreeze,jdbcType=INTEGER}, #{quantitySupplier,jdbcType=INTEGER},
......@@ -197,7 +204,9 @@
#{occupyStockShare,jdbcType=INTEGER}, #{occupyStockPrivate,jdbcType=INTEGER}, #{occupyStock,jdbcType=INTEGER},
#{occupyActivity,jdbcType=INTEGER}, #{occupyOrderPrivate,jdbcType=INTEGER}, #{occupyOrderShare,jdbcType=INTEGER},
#{occupyOrder,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{shippedStock,jdbcType=INTEGER},
#{skuTitleCn,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseStock">
<!--
......@@ -302,6 +311,18 @@
<if test="updateTime != null">
update_time,
</if>
<if test="shippedStock != null">
shipped_stock,
</if>
<if test="skuTitleCn != null">
sku_title_cn,
</if>
<if test="productInnerCode != null">
product_inner_code,
</if>
<if test="suppliersName != null">
suppliers_name,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -400,6 +421,18 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="shippedStock != null">
#{shippedStock,jdbcType=INTEGER},
</if>
<if test="skuTitleCn != null">
#{skuTitleCn,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
#{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
#{suppliersName,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseStockExample" resultType="java.lang.Long">
......@@ -515,6 +548,18 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.shippedStock != null">
shipped_stock = #{record.shippedStock,jdbcType=INTEGER},
</if>
<if test="record.skuTitleCn != null">
sku_title_cn = #{record.skuTitleCn,jdbcType=VARCHAR},
</if>
<if test="record.productInnerCode != null">
product_inner_code = #{record.productInnerCode,jdbcType=VARCHAR},
</if>
<if test="record.suppliersName != null">
suppliers_name = #{record.suppliersName,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -557,7 +602,11 @@
gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
shipped_stock = #{record.shippedStock,jdbcType=INTEGER},
sku_title_cn = #{record.skuTitleCn,jdbcType=VARCHAR},
product_inner_code = #{record.productInnerCode,jdbcType=VARCHAR},
suppliers_name = #{record.suppliersName,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -662,6 +711,18 @@
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="shippedStock != null">
shipped_stock = #{shippedStock,jdbcType=INTEGER},
</if>
<if test="skuTitleCn != null">
sku_title_cn = #{skuTitleCn,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
suppliers_name = #{suppliersName,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -701,7 +762,11 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP},
shipped_stock = #{shippedStock,jdbcType=INTEGER},
sku_title_cn = #{skuTitleCn,jdbcType=VARCHAR},
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
suppliers_name = #{suppliersName,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseStock">
......@@ -808,6 +873,18 @@
<if test="updateTime != null">
update_time,
</if>
<if test="shippedStock != null">
shipped_stock,
</if>
<if test="skuTitleCn != null">
sku_title_cn,
</if>
<if test="productInnerCode != null">
product_inner_code,
</if>
<if test="suppliersName != null">
suppliers_name,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -907,6 +984,18 @@
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="shippedStock != null">
#{shippedStock,jdbcType=INTEGER},
</if>
<if test="skuTitleCn != null">
#{skuTitleCn,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
#{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
#{suppliersName,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -1006,6 +1095,18 @@
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="shippedStock != null">
shipped_stock = #{shippedStock,jdbcType=INTEGER},
</if>
<if test="skuTitleCn != null">
sku_title_cn = #{skuTitleCn,jdbcType=VARCHAR},
</if>
<if test="productInnerCode != null">
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
</if>
<if test="suppliersName != null">
suppliers_name = #{suppliersName,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseStock">
......@@ -1020,7 +1121,8 @@
quantity_transit, wait_check, wait_putaway, usable_stock, usable_sales, usable_sales_private,
usable_sales_share, in_warehouse_share, in_warehouse_private, in_warehouse, occupy_stock_share,
occupy_stock_private, occupy_stock, occupy_activity, occupy_order_private, occupy_order_share,
occupy_order, gmt_create, gmt_modified, create_time, update_time)
occupy_order, gmt_create, gmt_modified, create_time, update_time, shipped_stock,
sku_title_cn, product_inner_code, suppliers_name)
values
(#{id,jdbcType=INTEGER}, #{bailunSku,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
#{ownerCode,jdbcType=VARCHAR}, #{quantityReservation,jdbcType=INTEGER}, #{quantityTransport,jdbcType=INTEGER},
......@@ -1032,7 +1134,9 @@
#{occupyStockShare,jdbcType=INTEGER}, #{occupyStockPrivate,jdbcType=INTEGER}, #{occupyStock,jdbcType=INTEGER},
#{occupyActivity,jdbcType=INTEGER}, #{occupyOrderPrivate,jdbcType=INTEGER}, #{occupyOrderShare,jdbcType=INTEGER},
#{occupyOrder,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{shippedStock,jdbcType=INTEGER},
#{skuTitleCn,jdbcType=VARCHAR}, #{productInnerCode,jdbcType=VARCHAR}, #{suppliersName,jdbcType=VARCHAR}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
......@@ -1065,7 +1169,11 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP},
shipped_stock = #{shippedStock,jdbcType=INTEGER},
sku_title_cn = #{skuTitleCn,jdbcType=VARCHAR},
product_inner_code = #{productInnerCode,jdbcType=VARCHAR},
suppliers_name = #{suppliersName,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseStockExample" resultMap="BaseResultMap">
<!--
......@@ -1085,6 +1193,7 @@
limit 1
</select>
<select id="listNoChinaWarehouse" resultType="com.bailuntec.domain.entity.DcBaseStock">
SELECT * FROM dc_base_stock tb1 inner join dc_base_warehouse tb2 on tb1.warehouse_code = tb2.warehouse_code and tb2.hq_type in ('FBA仓','海外仓','第三方仓库') order by type_id desc limit #{v1}, #{v2}
</select>
......
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment