Skip to content

D
dc-java
Commit 91a9ea54 by huluobin
Options

# 更新

parent 00fad657
Showing with 994 additions and 53 deletions
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
......@@ -5,8 +5,17 @@ import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @author robbendev
*/
@Data
public class DcAutoTurnover {
public static final String SOURCE_AIMS = "aims配置";
public static final String SOURCE_LMS = "lms配置";
public static final String SOURCE_AIR = "空运切换";
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.id
......@@ -688,6 +697,22 @@ public class DcAutoTurnover {
private BigDecimal ordersAvg;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.adv_uid
*
* @mbg.generated
*/
private String advUid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.purchase_create_order_days
*
* @mbg.generated
*/
private Integer purchaseCreateOrderDays;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
......@@ -784,6 +809,8 @@ public class DcAutoTurnover {
sb.append(", firstOrderDate=").append(firstOrderDate);
sb.append(", firstOrderBailunOrderId=").append(firstOrderBailunOrderId);
sb.append(", ordersAvg=").append(ordersAvg);
sb.append(", advUid=").append(advUid);
sb.append(", purchaseCreateOrderDays=").append(purchaseCreateOrderDays);
sb.append("]");
return sb.toString();
}
......@@ -890,7 +917,9 @@ public class DcAutoTurnover {
&& (this.getAutoReplaceLogisticsTaskId() == null ? other.getAutoReplaceLogisticsTaskId() == null : this.getAutoReplaceLogisticsTaskId().equals(other.getAutoReplaceLogisticsTaskId()))
&& (this.getFirstOrderDate() == null ? other.getFirstOrderDate() == null : this.getFirstOrderDate().equals(other.getFirstOrderDate()))
&& (this.getFirstOrderBailunOrderId() == null ? other.getFirstOrderBailunOrderId() == null : this.getFirstOrderBailunOrderId().equals(other.getFirstOrderBailunOrderId()))
&& (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()));
&& (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()))
&& (this.getAdvUid() == null ? other.getAdvUid() == null : this.getAdvUid().equals(other.getAdvUid()))
&& (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()));
}
/**
......@@ -988,10 +1017,8 @@ public class DcAutoTurnover {
result = prime * result + ((getFirstOrderDate() == null) ? 0 : getFirstOrderDate().hashCode());
result = prime * result + ((getFirstOrderBailunOrderId() == null) ? 0 : getFirstOrderBailunOrderId().hashCode());
result = prime * result + ((getOrdersAvg() == null) ? 0 : getOrdersAvg().hashCode());
result = prime * result + ((getAdvUid() == null) ? 0 : getAdvUid().hashCode());
result = prime * result + ((getPurchaseCreateOrderDays() == null) ? 0 : getPurchaseCreateOrderDays().hashCode());
return result;
}
public static final String SOURCE_AIMS = "aims配置";
public static final String SOURCE_LMS = "lms配置";
public static final String SOURCE_AIR = "空运切换";
}
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnoverWithBLOBs.java
......@@ -157,6 +157,8 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
&& (this.getFirstOrderDate() == null ? other.getFirstOrderDate() == null : this.getFirstOrderDate().equals(other.getFirstOrderDate()))
&& (this.getFirstOrderBailunOrderId() == null ? other.getFirstOrderBailunOrderId() == null : this.getFirstOrderBailunOrderId().equals(other.getFirstOrderBailunOrderId()))
&& (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()))
&& (this.getAdvUid() == null ? other.getAdvUid() == null : this.getAdvUid().equals(other.getAdvUid()))
&& (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()))
&& (this.getSalesDetails() == null ? other.getSalesDetails() == null : this.getSalesDetails().equals(other.getSalesDetails()))
&& (this.getShortSupplyDetails() == null ? other.getShortSupplyDetails() == null : this.getShortSupplyDetails().equals(other.getShortSupplyDetails()))
&& (this.getSalesDetailsFormula() == null ? other.getSalesDetailsFormula() == null : this.getSalesDetailsFormula().equals(other.getSalesDetailsFormula()));
......@@ -257,6 +259,8 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
result = prime * result + ((getFirstOrderDate() == null) ? 0 : getFirstOrderDate().hashCode());
result = prime * result + ((getFirstOrderBailunOrderId() == null) ? 0 : getFirstOrderBailunOrderId().hashCode());
result = prime * result + ((getOrdersAvg() == null) ? 0 : getOrdersAvg().hashCode());
result = prime * result + ((getAdvUid() == null) ? 0 : getAdvUid().hashCode());
result = prime * result + ((getPurchaseCreateOrderDays() == null) ? 0 : getPurchaseCreateOrderDays().hashCode());
result = prime * result + ((getSalesDetails() == null) ? 0 : getSalesDetails().hashCode());
result = prime * result + ((getShortSupplyDetails() == null) ? 0 : getShortSupplyDetails().hashCode());
result = prime * result + ((getSalesDetailsFormula() == null) ? 0 : getSalesDetailsFormula().hashCode());
......
data-common/src/main/java/com/bailuntec/domain/entity/DcAveragePurchase.java
package com.bailuntec.domain.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
@Data
public class DcAveragePurchase {
......@@ -95,7 +94,34 @@ public class DcAveragePurchase {
*
* @mbg.generated
*/
private Integer paymentType;
private Byte paymentType;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_purchase.virtual_delivery_days
*
* @mbg.generated
*/
private Integer virtualDeliveryDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_purchase.create_order_days
*
* @mbg.generated
*/
private Integer createOrderDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_purchase.payment_before_delivery
*
* @mbg.generated
*/
private Integer paymentBeforeDelivery;
/**
* This method was generated by MyBatis Generator.
......@@ -119,6 +145,9 @@ public class DcAveragePurchase {
sb.append(", inboundDays=").append(inboundDays);
sb.append(", updateTime=").append(updateTime);
sb.append(", paymentType=").append(paymentType);
sb.append(", virtualDeliveryDays=").append(virtualDeliveryDays);
sb.append(", createOrderDays=").append(createOrderDays);
sb.append(", paymentBeforeDelivery=").append(paymentBeforeDelivery);
sb.append("]");
return sb.toString();
}
......@@ -150,7 +179,10 @@ public class DcAveragePurchase {
&& (this.getDeliveryDays() == null ? other.getDeliveryDays() == null : this.getDeliveryDays().equals(other.getDeliveryDays()))
&& (this.getInboundDays() == null ? other.getInboundDays() == null : this.getInboundDays().equals(other.getInboundDays()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getPaymentType() == null ? other.getPaymentType() == null : this.getPaymentType().equals(other.getPaymentType()));
&& (this.getPaymentType() == null ? other.getPaymentType() == null : this.getPaymentType().equals(other.getPaymentType()))
&& (this.getVirtualDeliveryDays() == null ? other.getVirtualDeliveryDays() == null : this.getVirtualDeliveryDays().equals(other.getVirtualDeliveryDays()))
&& (this.getCreateOrderDays() == null ? other.getCreateOrderDays() == null : this.getCreateOrderDays().equals(other.getCreateOrderDays()))
&& (this.getPaymentBeforeDelivery() == null ? other.getPaymentBeforeDelivery() == null : this.getPaymentBeforeDelivery().equals(other.getPaymentBeforeDelivery()));
}
/**
......@@ -173,6 +205,9 @@ public class DcAveragePurchase {
result = prime * result + ((getInboundDays() == null) ? 0 : getInboundDays().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getPaymentType() == null) ? 0 : getPaymentType().hashCode());
result = prime * result + ((getVirtualDeliveryDays() == null) ? 0 : getVirtualDeliveryDays().hashCode());
result = prime * result + ((getCreateOrderDays() == null) ? 0 : getCreateOrderDays().hashCode());
result = prime * result + ((getPaymentBeforeDelivery() == null) ? 0 : getPaymentBeforeDelivery().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcAverageWarehouse.java
package com.bailuntec.domain.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
@Data
public class DcAverageWarehouse {
......@@ -98,6 +97,114 @@ public class DcAverageWarehouse {
private BigDecimal transferDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.product_count
*
* @mbg.generated
*/
private Integer productCount;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.order_count
*
* @mbg.generated
*/
private Integer orderCount;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.product_count_2
*
* @mbg.generated
*/
private Integer productCount2;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.order_count_2
*
* @mbg.generated
*/
private Integer orderCount2;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.product_count_3
*
* @mbg.generated
*/
private Integer productCount3;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.order_count_3
*
* @mbg.generated
*/
private Integer orderCount3;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.transfer_bale_delivery_ocean
*
* @mbg.generated
*/
private BigDecimal transferBaleDeliveryOcean;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.abroad_inbound_delivery_ocean
*
* @mbg.generated
*/
private BigDecimal abroadInboundDeliveryOcean;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.transfer_delivery_ocean
*
* @mbg.generated
*/
private BigDecimal transferDeliveryOcean;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.transfer_bale_delivery_empty
*
* @mbg.generated
*/
private BigDecimal transferBaleDeliveryEmpty;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.abroad_inbound_delivery_empty
*
* @mbg.generated
*/
private BigDecimal abroadInboundDeliveryEmpty;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_average_warehouse.transfer_delivery_empty
*
* @mbg.generated
*/
private BigDecimal transferDeliveryEmpty;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_average_warehouse
*
......@@ -119,6 +226,18 @@ public class DcAverageWarehouse {
sb.append(", transferBaleDelivery=").append(transferBaleDelivery);
sb.append(", abroadInboundDelivery=").append(abroadInboundDelivery);
sb.append(", transferDelivery=").append(transferDelivery);
sb.append(", productCount=").append(productCount);
sb.append(", orderCount=").append(orderCount);
sb.append(", productCount2=").append(productCount2);
sb.append(", orderCount2=").append(orderCount2);
sb.append(", productCount3=").append(productCount3);
sb.append(", orderCount3=").append(orderCount3);
sb.append(", transferBaleDeliveryOcean=").append(transferBaleDeliveryOcean);
sb.append(", abroadInboundDeliveryOcean=").append(abroadInboundDeliveryOcean);
sb.append(", transferDeliveryOcean=").append(transferDeliveryOcean);
sb.append(", transferBaleDeliveryEmpty=").append(transferBaleDeliveryEmpty);
sb.append(", abroadInboundDeliveryEmpty=").append(abroadInboundDeliveryEmpty);
sb.append(", transferDeliveryEmpty=").append(transferDeliveryEmpty);
sb.append("]");
return sb.toString();
}
......@@ -150,7 +269,19 @@ public class DcAverageWarehouse {
&& (this.getTransferType2Days() == null ? other.getTransferType2Days() == null : this.getTransferType2Days().equals(other.getTransferType2Days()))
&& (this.getTransferBaleDelivery() == null ? other.getTransferBaleDelivery() == null : this.getTransferBaleDelivery().equals(other.getTransferBaleDelivery()))
&& (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
&& (this.getTransferDelivery() == null ? other.getTransferDelivery() == null : this.getTransferDelivery().equals(other.getTransferDelivery()));
&& (this.getTransferDelivery() == null ? other.getTransferDelivery() == null : this.getTransferDelivery().equals(other.getTransferDelivery()))
&& (this.getProductCount() == null ? other.getProductCount() == null : this.getProductCount().equals(other.getProductCount()))
&& (this.getOrderCount() == null ? other.getOrderCount() == null : this.getOrderCount().equals(other.getOrderCount()))
&& (this.getProductCount2() == null ? other.getProductCount2() == null : this.getProductCount2().equals(other.getProductCount2()))
&& (this.getOrderCount2() == null ? other.getOrderCount2() == null : this.getOrderCount2().equals(other.getOrderCount2()))
&& (this.getProductCount3() == null ? other.getProductCount3() == null : this.getProductCount3().equals(other.getProductCount3()))
&& (this.getOrderCount3() == null ? other.getOrderCount3() == null : this.getOrderCount3().equals(other.getOrderCount3()))
&& (this.getTransferBaleDeliveryOcean() == null ? other.getTransferBaleDeliveryOcean() == null : this.getTransferBaleDeliveryOcean().equals(other.getTransferBaleDeliveryOcean()))
&& (this.getAbroadInboundDeliveryOcean() == null ? other.getAbroadInboundDeliveryOcean() == null : this.getAbroadInboundDeliveryOcean().equals(other.getAbroadInboundDeliveryOcean()))
&& (this.getTransferDeliveryOcean() == null ? other.getTransferDeliveryOcean() == null : this.getTransferDeliveryOcean().equals(other.getTransferDeliveryOcean()))
&& (this.getTransferBaleDeliveryEmpty() == null ? other.getTransferBaleDeliveryEmpty() == null : this.getTransferBaleDeliveryEmpty().equals(other.getTransferBaleDeliveryEmpty()))
&& (this.getAbroadInboundDeliveryEmpty() == null ? other.getAbroadInboundDeliveryEmpty() == null : this.getAbroadInboundDeliveryEmpty().equals(other.getAbroadInboundDeliveryEmpty()))
&& (this.getTransferDeliveryEmpty() == null ? other.getTransferDeliveryEmpty() == null : this.getTransferDeliveryEmpty().equals(other.getTransferDeliveryEmpty()));
}
/**
......@@ -173,6 +304,18 @@ public class DcAverageWarehouse {
result = prime * result + ((getTransferBaleDelivery() == null) ? 0 : getTransferBaleDelivery().hashCode());
result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
result = prime * result + ((getTransferDelivery() == null) ? 0 : getTransferDelivery().hashCode());
result = prime * result + ((getProductCount() == null) ? 0 : getProductCount().hashCode());
result = prime * result + ((getOrderCount() == null) ? 0 : getOrderCount().hashCode());
result = prime * result + ((getProductCount2() == null) ? 0 : getProductCount2().hashCode());
result = prime * result + ((getOrderCount2() == null) ? 0 : getOrderCount2().hashCode());
result = prime * result + ((getProductCount3() == null) ? 0 : getProductCount3().hashCode());
result = prime * result + ((getOrderCount3() == null) ? 0 : getOrderCount3().hashCode());
result = prime * result + ((getTransferBaleDeliveryOcean() == null) ? 0 : getTransferBaleDeliveryOcean().hashCode());
result = prime * result + ((getAbroadInboundDeliveryOcean() == null) ? 0 : getAbroadInboundDeliveryOcean().hashCode());
result = prime * result + ((getTransferDeliveryOcean() == null) ? 0 : getTransferDeliveryOcean().hashCode());
result = prime * result + ((getTransferBaleDeliveryEmpty() == null) ? 0 : getTransferBaleDeliveryEmpty().hashCode());
result = prime * result + ((getAbroadInboundDeliveryEmpty() == null) ? 0 : getAbroadInboundDeliveryEmpty().hashCode());
result = prime * result + ((getTransferDeliveryEmpty() == null) ? 0 : getTransferDeliveryEmpty().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverAirExample.java 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverExample.java
......@@ -5700,6 +5700,136 @@ public class DcAutoTurnoverExample {
addCriterion("orders_avg not between", value1, value2, "ordersAvg");
return (Criteria) this;
}
public Criteria andAdvUidIsNull() {
addCriterion("adv_uid is null");
return (Criteria) this;
}
public Criteria andAdvUidIsNotNull() {
addCriterion("adv_uid is not null");
return (Criteria) this;
}
public Criteria andAdvUidEqualTo(String value) {
addCriterion("adv_uid =", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidNotEqualTo(String value) {
addCriterion("adv_uid <>", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidGreaterThan(String value) {
addCriterion("adv_uid >", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidGreaterThanOrEqualTo(String value) {
addCriterion("adv_uid >=", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidLessThan(String value) {
addCriterion("adv_uid <", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidLessThanOrEqualTo(String value) {
addCriterion("adv_uid <=", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidLike(String value) {
addCriterion("adv_uid like", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidNotLike(String value) {
addCriterion("adv_uid not like", value, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidIn(List<String> values) {
addCriterion("adv_uid in", values, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidNotIn(List<String> values) {
addCriterion("adv_uid not in", values, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidBetween(String value1, String value2) {
addCriterion("adv_uid between", value1, value2, "advUid");
return (Criteria) this;
}
public Criteria andAdvUidNotBetween(String value1, String value2) {
addCriterion("adv_uid not between", value1, value2, "advUid");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysIsNull() {
addCriterion("purchase_create_order_days is null");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysIsNotNull() {
addCriterion("purchase_create_order_days is not null");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysEqualTo(Integer value) {
addCriterion("purchase_create_order_days =", value, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysNotEqualTo(Integer value) {
addCriterion("purchase_create_order_days <>", value, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysGreaterThan(Integer value) {
addCriterion("purchase_create_order_days >", value, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysGreaterThanOrEqualTo(Integer value) {
addCriterion("purchase_create_order_days >=", value, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysLessThan(Integer value) {
addCriterion("purchase_create_order_days <", value, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysLessThanOrEqualTo(Integer value) {
addCriterion("purchase_create_order_days <=", value, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysIn(List<Integer> values) {
addCriterion("purchase_create_order_days in", values, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysNotIn(List<Integer> values) {
addCriterion("purchase_create_order_days not in", values, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysBetween(Integer value1, Integer value2) {
addCriterion("purchase_create_order_days between", value1, value2, "purchaseCreateOrderDays");
return (Criteria) this;
}
public Criteria andPurchaseCreateOrderDaysNotBetween(Integer value1, Integer value2) {
addCriterion("purchase_create_order_days not between", value1, value2, "purchaseCreateOrderDays");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/domain/example/DcAutoTurnoverOceanExample.java 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverAirMapper.java 0 → 100644
package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcAutoTurnoverAir;
import com.bailuntec.domain.entity.DcAutoTurnoverAirWithBLOBs;
import com.bailuntec.domain.example.DcAutoTurnoverAirExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DcAutoTurnoverAirMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
long countByExample(DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int deleteByExample(DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int deleteByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int insert(DcAutoTurnoverAirWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int insertSelective(DcAutoTurnoverAirWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcAutoTurnoverAir selectOneByExample(DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcAutoTurnoverAirWithBLOBs selectOneByExampleWithBLOBs(DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
List<DcAutoTurnoverAirWithBLOBs> selectByExampleWithBLOBs(DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
List<DcAutoTurnoverAir> selectByExample(DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
DcAutoTurnoverAirWithBLOBs selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DcAutoTurnoverAirWithBLOBs record, @Param("example") DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int updateByExampleWithBLOBs(@Param("record") DcAutoTurnoverAirWithBLOBs record, @Param("example") DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int updateByExample(@Param("record") DcAutoTurnoverAir record, @Param("example") DcAutoTurnoverAirExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DcAutoTurnoverAirWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int updateByPrimaryKeyWithBLOBs(DcAutoTurnoverAirWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
*/
int updateByPrimaryKey(DcAutoTurnoverAir record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsert(DcAutoTurnoverAir record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcAutoTurnoverAirWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_air
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertWithBLOBs(DcAutoTurnoverAirWithBLOBs record);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverAirMapper.xml 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.java
......@@ -2,11 +2,12 @@ package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcAutoTurnover;
import com.bailuntec.domain.entity.DcAutoTurnoverWithBLOBs;
import com.bailuntec.domain.example.DcAutoTurnoverExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import com.bailuntec.domain.example.DcAutoTurnoverExample;
import org.apache.ibatis.annotations.Param;
public interface DcAutoTurnoverMapper {
/**
* This method was generated by MyBatis Generator.
......@@ -164,7 +165,4 @@ public interface DcAutoTurnoverMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertWithBLOBs(DcAutoTurnoverWithBLOBs record);
DcAutoTurnoverWithBLOBs selectByUnionKey(@Param("bailunSku") String bailunSku,
@Param("warehouseCode") String warehouseCode);
}
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverMapper.xml
This source diff could not be displayed because it is too large. You can view the blob instead.
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverOceanMapper.java 0 → 100644
package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcAutoTurnoverOcean;
import com.bailuntec.domain.entity.DcAutoTurnoverOceanWithBLOBs;
import com.bailuntec.domain.example.DcAutoTurnoverOceanExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DcAutoTurnoverOceanMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
long countByExample(DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int deleteByExample(DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int deleteByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int insert(DcAutoTurnoverOceanWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int insertSelective(DcAutoTurnoverOceanWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcAutoTurnoverOcean selectOneByExample(DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcAutoTurnoverOceanWithBLOBs selectOneByExampleWithBLOBs(DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
List<DcAutoTurnoverOceanWithBLOBs> selectByExampleWithBLOBs(DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
List<DcAutoTurnoverOcean> selectByExample(DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
DcAutoTurnoverOceanWithBLOBs selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DcAutoTurnoverOceanWithBLOBs record, @Param("example") DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int updateByExampleWithBLOBs(@Param("record") DcAutoTurnoverOceanWithBLOBs record, @Param("example") DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int updateByExample(@Param("record") DcAutoTurnoverOcean record, @Param("example") DcAutoTurnoverOceanExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DcAutoTurnoverOceanWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int updateByPrimaryKeyWithBLOBs(DcAutoTurnoverOceanWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
*/
int updateByPrimaryKey(DcAutoTurnoverOcean record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsert(DcAutoTurnoverOcean record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcAutoTurnoverOceanWithBLOBs record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover_ocean
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertWithBLOBs(DcAutoTurnoverOceanWithBLOBs record);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcAutoTurnoverOceanMapper.xml 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
data-common/src/main/java/com/bailuntec/mapper/DcAveragePurchaseMapper.java
......@@ -2,9 +2,8 @@ package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcAveragePurchase;
import com.bailuntec.domain.example.DcAveragePurchaseExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DcAveragePurchaseMapper {
/**
......@@ -121,9 +120,4 @@ public interface DcAveragePurchaseMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcAveragePurchase record);
//根据唯一键查询
DcAveragePurchase selectByUnionKey(@Param("bailunSku") String bailunSku,
@Param("warehouseCode") String warehouseCode,
@Param("suppliersId") Integer suppliersId);
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcAverageWarehouseMapper.java
......@@ -2,9 +2,8 @@ package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcAverageWarehouse;
import com.bailuntec.domain.example.DcAverageWarehouseExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DcAverageWarehouseMapper {
/**
......@@ -121,8 +120,4 @@ public interface DcAverageWarehouseMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcAverageWarehouse record);
//根据唯一键查询
DcAverageWarehouse selectByUnionKey(@Param("bailunSku") String bailunSku,
@Param("warehouseCode") String warehouseCode);
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBaseStockMapper.java
......@@ -236,4 +236,40 @@ public interface DcBaseStockMapper {
List<DcBaseStock> listNeNormal(@Param("shardingContext") ShardingContext shardingContext, int i, Integer pageSize);
long countNeNormal(@Param("shardingContext") ShardingContext shardingContext);
/**
* 需要应用空运头程计算的stock
*
* @param shardingContext 分片参数
* @param pageStart 页码
* @param pageOffset 分页
* @return res
*/
List<DcBaseStock> selectAir(@Param("shardingContext") ShardingContext shardingContext, @Param("pageStart") int pageStart, @Param("pageOffset") int pageOffset);
/**
* 需要应用海运头程计算的stock
*
* @param shardingContext 分片参数
* @param pageStart 页码
* @param pageOffset 分页
* @return res
*/
List<DcBaseStock> selectOcean(@Param("shardingContext") ShardingContext shardingContext, @Param("pageStart") int pageStart, @Param("pageOffset") int pageOffset);
/**
* 需要应用空运头程计算的stock count
*
* @param shardingContext 分片参数
* @return res
*/
long countAir(@Param("shardingContext") ShardingContext shardingContext);
/**
* 需要应用海运头程计算的stock count
*
* @param shardingContext 分片参数
* @return res
*/
long countOcean(@Param("shardingContext") ShardingContext shardingContext);
}
data-common/src/main/java/com/bailuntec/mapper/DcBaseStockMapper.xml
......@@ -1469,5 +1469,39 @@
and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
</select>
<select id="selectOcean" resultType="com.bailuntec.domain.entity.DcBaseStock">
select t1.*
from dc_base_stock t1
left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
where t2.hq_type = '海外仓'
and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
limit #{pageStart}, #{pageOffset}
</select>
<select id="selectAir" resultType="com.bailuntec.domain.entity.DcBaseStock">
select t1.*
from dc_base_stock t1
left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
where t2.hq_type = '海外仓'
and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
limit #{pageStart}, #{pageOffset}
</select>
<select id="countAir" resultType="java.lang.Long">
select count(t1.id)
from dc_base_stock t1
left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
where t2.hq_type = '海外仓'
and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
</select>
<select id="countOcean" resultType="java.lang.Long">
select count(t1.id)
from dc_base_stock t1
left join dc_base_warehouse t2 on t1.warehouse_code = t2.warehouse_code
where t2.hq_type = '海外仓'
and t1.id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
</select>
</mapper>
data-common/src/main/resources/init.properties
table-name=dc_base_queue
table-name=dc_auto_turnover_air
data-show/show-auto-turnover/src/main/java/com/bailuntec/domain/constant/Constant.java
......@@ -7,21 +7,33 @@ import java.time.LocalDateTime;
import java.util.List;
public interface Constant {
Integer MIN_AUTO_FORECAST_DAY = 31;//配置最少预测多少天
//质检天数
/**
* 配置最少预测多少天
*/
Integer MIN_AUTO_FORECAST_DAY = 31;
/**
* 质检天数
*/
Integer INSPECTION_DELIVE = 2;
Integer TURNOVER_MULTIPLE = 2;//周转倍数
/**
* 周转倍数
*/
Integer TURNOVER_MULTIPLE = 2;
String ALGORITHM_NAME = "算法预测";
String NAN_STRING = "N/A";
String PURCHASE_SIGN = "p_";
String TRANSFER_SIGN = "t_";
//自动周转JIT的 可以不做 冗余 和 缺货预测 实际冗余和实际缺货也不用提醒
//这三个采购都是美甲和精油的, 都是JIT的
/**
* 自动周转JIT的 可以不做 冗余 和 缺货预测 实际冗余和实际缺货也不用提醒 这三个采购都是美甲和精油的, 都是JIT的
*/
String BUYER_JIT_1 = "张莹霞";
String BUYER_JIT_2 = "张莹霞1";
String BUYER_JIT_3 = "冯兆欣";
//JIT三兄弟！
/**
* JIT三兄弟!
*/
List<String> BUYER_JIT_123 = Lists.newArrayList(BUYER_JIT_1, BUYER_JIT_2, BUYER_JIT_3);
String BUYER_JIT_4 = "黄镜洁";
......@@ -32,7 +44,20 @@ public interface Constant {
BigDecimal BIGDECIMAL_FOURTEEN = BigDecimal.valueOf(14);
BigDecimal BIGDECIMAL_SEVEN = BigDecimal.valueOf(7);
BigDecimal BIGDECIMAL_THREE = BigDecimal.valueOf(3);
BigDecimal FBA_OUT_STOCK_DECREASE = BigDecimal.valueOf(0.93);// 0.93 = 1 - 0.07, 来自老板提的FBA断货, 销量递减
BigDecimal FBA_OUT_STOCK_INCREMENT = BigDecimal.valueOf(1.07);// 0.93 = 1 - 0.07, 来自老板提的FBA断货, 销量递减
/**
* 0.93 = 1 - 0.07, 来自老板提的FBA断货, 销量递减
*/
BigDecimal FBA_OUT_STOCK_DECREASE = BigDecimal.valueOf(0.93);
/**
* 0.93 = 1 - 0.07, 来自老板提的FBA断货, 销量递减
*/
BigDecimal FBA_OUT_STOCK_INCREMENT = BigDecimal.valueOf(1.07);
LocalDateTime INIT_DATE_TIME = LocalDateTime.of(1990, 1, 1, 0, 0);
String OCEAN_HEAD = "海运头程";
String AIR_HEAD = "空运头程";
}
data-show/show-auto-turnover/src/test/java/com/bailuntec/job/AutoTurnoverJobTest.java
......@@ -4,6 +4,7 @@ package com.bailuntec.job;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.annotation.ExcelProperty;
import com.bailuntec.domain.constant.CommonConstant;
import com.bailuntec.domain.constant.Constant;
import com.bailuntec.domain.entity.DcAutoTurnover;
import com.bailuntec.domain.entity.DcBaseStock;
import com.bailuntec.domain.entity.JobPointLog;
......@@ -45,7 +46,7 @@ public class AutoTurnoverJobTest {
jobPointLog.setPageSize(1000);
AutoTurnoverJob autoTurnoverJob = new AutoTurnoverJob();
autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 1, "INCREMENT", new HashMap<>()), 0),
autoTurnoverJob.executeJob(new ShardingContext(new ShardingContexts("x", null, 1, Constant.OCEAN_HEAD, new HashMap<>()), 0),
jobPointLog);
}
......
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