Skip to content

D
dc-java
Commit f5261664 by yinyong
Options

库存流水仓库id更改

parent cd24d775
Showing with 65 additions and 52 deletions
data-base/base-sync-semi-order/src/main/java/com/bailuntec/job/SemiStockReportSyncJob.java
......@@ -9,7 +9,9 @@ import com.bailuntec.domain.entity.DcSemiStockReport;
import com.bailuntec.domain.entity.JobPointLog;
import com.bailuntec.domain.pojo.SemiStockReportInfo;
import com.bailuntec.mapper.DcSemiStockReportMapper;
import com.bailuntec.mapper.JobPointLogMapper;
import com.bailuntec.support.PointJob;
import com.bailuntec.utils.ExceptionUtil;
import com.bailuntec.utils.OkHttpUtil;
import com.bailuntec.utils.PropertiesUtil;
import com.bailuntec.utils.SessionUtil;
......@@ -76,6 +78,17 @@ public class SemiStockReportSyncJob extends PointJob {
} else {
throw new RuntimeException("调用库存流水报表接口同步百伦库存流水失败, 响应为null, 请求参数" + map.toString());
}
if (jobPointLog.getPageIndex() % 10 == 0) {
try {
JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
mapper.upsertSelective(jobPointLog);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(ExceptionUtil.transform(e), e);
} finally {
SessionUtil.closeSession();
}
}
jobPointLog.setPageIndex(jobPointLog.getPageIndex() + 1);
} while (jobPointLog.getPageIndex() <= totalPage);
jobPointLog.setPageIndex(0);
......
data-common/src/main/java/com/bailuntec/domain/entity/DcSemiStockReport.java
......@@ -91,11 +91,11 @@ public class DcSemiStockReport {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_semi_stock_report.warehousel_id
* This field corresponds to the database column dc_semi_stock_report.warehouse_id
*
* @mbg.generated
*/
private Integer warehouselId;
private Integer warehouseId;
/**
*
......@@ -253,7 +253,7 @@ public class DcSemiStockReport {
sb.append(", stock=").append(stock);
sb.append(", createUserName=").append(createUserName);
sb.append(", createTime=").append(createTime);
sb.append(", warehouselId=").append(warehouselId);
sb.append(", warehouseId=").append(warehouseId);
sb.append(", stockType=").append(stockType);
sb.append(", stockTypeStr=").append(stockTypeStr);
sb.append(", materialCode=").append(materialCode);
......@@ -300,7 +300,7 @@ public class DcSemiStockReport {
&& (this.getStock() == null ? other.getStock() == null : this.getStock().equals(other.getStock()))
&& (this.getCreateUserName() == null ? other.getCreateUserName() == null : this.getCreateUserName().equals(other.getCreateUserName()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getWarehouselId() == null ? other.getWarehouselId() == null : this.getWarehouselId().equals(other.getWarehouselId()))
&& (this.getWarehouseId() == null ? other.getWarehouseId() == null : this.getWarehouseId().equals(other.getWarehouseId()))
&& (this.getStockType() == null ? other.getStockType() == null : this.getStockType().equals(other.getStockType()))
&& (this.getStockTypeStr() == null ? other.getStockTypeStr() == null : this.getStockTypeStr().equals(other.getStockTypeStr()))
&& (this.getMaterialCode() == null ? other.getMaterialCode() == null : this.getMaterialCode().equals(other.getMaterialCode()))
......@@ -337,7 +337,7 @@ public class DcSemiStockReport {
result = prime * result + ((getStock() == null) ? 0 : getStock().hashCode());
result = prime * result + ((getCreateUserName() == null) ? 0 : getCreateUserName().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getWarehouselId() == null) ? 0 : getWarehouselId().hashCode());
result = prime * result + ((getWarehouseId() == null) ? 0 : getWarehouseId().hashCode());
result = prime * result + ((getStockType() == null) ? 0 : getStockType().hashCode());
result = prime * result + ((getStockTypeStr() == null) ? 0 : getStockTypeStr().hashCode());
result = prime * result + ((getMaterialCode() == null) ? 0 : getMaterialCode().hashCode());
......
data-common/src/main/java/com/bailuntec/domain/example/DcSemiStockReportExample.java
......@@ -951,63 +951,63 @@ public class DcSemiStockReportExample {
return (Criteria) this;
}
public Criteria andWarehouselIdIsNull() {
addCriterion("warehousel_id is null");
public Criteria andWarehouseIdIsNull() {
addCriterion("warehouse_id is null");
return (Criteria) this;
}
public Criteria andWarehouselIdIsNotNull() {
addCriterion("warehousel_id is not null");
public Criteria andWarehouseIdIsNotNull() {
addCriterion("warehouse_id is not null");
return (Criteria) this;
}
public Criteria andWarehouselIdEqualTo(Integer value) {
addCriterion("warehousel_id =", value, "warehouselId");
public Criteria andWarehouseIdEqualTo(Integer value) {
addCriterion("warehouse_id =", value, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdNotEqualTo(Integer value) {
addCriterion("warehousel_id <>", value, "warehouselId");
public Criteria andWarehouseIdNotEqualTo(Integer value) {
addCriterion("warehouse_id <>", value, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdGreaterThan(Integer value) {
addCriterion("warehousel_id >", value, "warehouselId");
public Criteria andWarehouseIdGreaterThan(Integer value) {
addCriterion("warehouse_id >", value, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdGreaterThanOrEqualTo(Integer value) {
addCriterion("warehousel_id >=", value, "warehouselId");
public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
addCriterion("warehouse_id >=", value, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdLessThan(Integer value) {
addCriterion("warehousel_id <", value, "warehouselId");
public Criteria andWarehouseIdLessThan(Integer value) {
addCriterion("warehouse_id <", value, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdLessThanOrEqualTo(Integer value) {
addCriterion("warehousel_id <=", value, "warehouselId");
public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
addCriterion("warehouse_id <=", value, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdIn(List<Integer> values) {
addCriterion("warehousel_id in", values, "warehouselId");
public Criteria andWarehouseIdIn(List<Integer> values) {
addCriterion("warehouse_id in", values, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdNotIn(List<Integer> values) {
addCriterion("warehousel_id not in", values, "warehouselId");
public Criteria andWarehouseIdNotIn(List<Integer> values) {
addCriterion("warehouse_id not in", values, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdBetween(Integer value1, Integer value2) {
addCriterion("warehousel_id between", value1, value2, "warehouselId");
public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
addCriterion("warehouse_id between", value1, value2, "warehouseId");
return (Criteria) this;
}
public Criteria andWarehouselIdNotBetween(Integer value1, Integer value2) {
addCriterion("warehousel_id not between", value1, value2, "warehouselId");
public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
addCriterion("warehouse_id not between", value1, value2, "warehouseId");
return (Criteria) this;
}
......
data-common/src/main/java/com/bailuntec/mapper/DcSemiStockReportMapper.xml
......@@ -15,7 +15,7 @@
<result column="stock" jdbcType="INTEGER" property="stock" />
<result column="create_user_name" jdbcType="VARCHAR" property="createUserName" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="warehousel_id" jdbcType="INTEGER" property="warehouselId" />
<result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
<result column="stock_type" jdbcType="CHAR" property="stockType" />
<result column="stock_type_str" jdbcType="VARCHAR" property="stockTypeStr" />
<result column="material_code" jdbcType="VARCHAR" property="materialCode" />
......@@ -104,7 +104,7 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, unique_no, log_id, warehouse_type, warehouse_type_str, material_id, stock, create_user_name,
create_time, warehousel_id, stock_type, stock_type_str, material_code, material_name,
create_time, warehouse_id, stock_type, stock_type_str, material_code, material_name,
material_category, new_price, warehouse_name, supplier_name, order_no, is_selfcontained,
is_selfcontained_str, remarks, is_zichang, gmt_create, gmt_modified
</sql>
......@@ -170,7 +170,7 @@
insert into dc_semi_stock_report (id, unique_no, log_id,
warehouse_type, warehouse_type_str, material_id,
stock, create_user_name, create_time,
warehousel_id, stock_type, stock_type_str,
warehouse_id, stock_type, stock_type_str,
material_code, material_name, material_category,
new_price, warehouse_name, supplier_name,
order_no, is_selfcontained, is_selfcontained_str,
......@@ -179,7 +179,7 @@
values (#{id,jdbcType=INTEGER}, #{uniqueNo,jdbcType=VARCHAR}, #{logId,jdbcType=INTEGER},
#{warehouseType,jdbcType=CHAR}, #{warehouseTypeStr,jdbcType=VARCHAR}, #{materialId,jdbcType=INTEGER},
#{stock,jdbcType=INTEGER}, #{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{warehouselId,jdbcType=INTEGER}, #{stockType,jdbcType=CHAR}, #{stockTypeStr,jdbcType=VARCHAR},
#{warehouseId,jdbcType=INTEGER}, #{stockType,jdbcType=CHAR}, #{stockTypeStr,jdbcType=VARCHAR},
#{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{materialCategory,jdbcType=VARCHAR},
#{newPrice,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{supplierName,jdbcType=VARCHAR},
#{orderNo,jdbcType=VARCHAR}, #{isSelfcontained,jdbcType=BIT}, #{isSelfcontainedStr,jdbcType=VARCHAR},
......@@ -220,8 +220,8 @@
<if test="createTime != null">
create_time,
</if>
<if test="warehouselId != null">
warehousel_id,
<if test="warehouseId != null">
warehouse_id,
</if>
<if test="stockType != null">
stock_type,
......@@ -297,8 +297,8 @@
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="warehouselId != null">
#{warehouselId,jdbcType=INTEGER},
<if test="warehouseId != null">
#{warehouseId,jdbcType=INTEGER},
</if>
<if test="stockType != null">
#{stockType,jdbcType=CHAR},
......@@ -391,8 +391,8 @@
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.warehouselId != null">
warehousel_id = #{record.warehouselId,jdbcType=INTEGER},
<if test="record.warehouseId != null">
warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
</if>
<if test="record.stockType != null">
stock_type = #{record.stockType,jdbcType=CHAR},
......@@ -459,7 +459,7 @@
stock = #{record.stock,jdbcType=INTEGER},
create_user_name = #{record.createUserName,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
warehousel_id = #{record.warehouselId,jdbcType=INTEGER},
warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
stock_type = #{record.stockType,jdbcType=CHAR},
stock_type_str = #{record.stockTypeStr,jdbcType=VARCHAR},
material_code = #{record.materialCode,jdbcType=VARCHAR},
......@@ -510,8 +510,8 @@
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="warehouselId != null">
warehousel_id = #{warehouselId,jdbcType=INTEGER},
<if test="warehouseId != null">
warehouse_id = #{warehouseId,jdbcType=INTEGER},
</if>
<if test="stockType != null">
stock_type = #{stockType,jdbcType=CHAR},
......@@ -575,7 +575,7 @@
stock = #{stock,jdbcType=INTEGER},
create_user_name = #{createUserName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
warehousel_id = #{warehouselId,jdbcType=INTEGER},
warehouse_id = #{warehouseId,jdbcType=INTEGER},
stock_type = #{stockType,jdbcType=CHAR},
stock_type_str = #{stockTypeStr,jdbcType=VARCHAR},
material_code = #{materialCode,jdbcType=VARCHAR},
......@@ -628,8 +628,8 @@
<if test="createTime != null">
create_time,
</if>
<if test="warehouselId != null">
warehousel_id,
<if test="warehouseId != null">
warehouse_id,
</if>
<if test="stockType != null">
stock_type,
......@@ -706,8 +706,8 @@
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="warehouselId != null">
#{warehouselId,jdbcType=INTEGER},
<if test="warehouseId != null">
#{warehouseId,jdbcType=INTEGER},
</if>
<if test="stockType != null">
#{stockType,jdbcType=CHAR},
......@@ -784,8 +784,8 @@
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="warehouselId != null">
warehousel_id = #{warehouselId,jdbcType=INTEGER},
<if test="warehouseId != null">
warehouse_id = #{warehouseId,jdbcType=INTEGER},
</if>
<if test="stockType != null">
stock_type = #{stockType,jdbcType=CHAR},
......@@ -842,14 +842,14 @@
-->
insert into dc_semi_stock_report
(id, unique_no, log_id, warehouse_type, warehouse_type_str, material_id, stock, create_user_name,
create_time, warehousel_id, stock_type, stock_type_str, material_code, material_name,
create_time, warehouse_id, stock_type, stock_type_str, material_code, material_name,
material_category, new_price, warehouse_name, supplier_name, order_no, is_selfcontained,
is_selfcontained_str, remarks, is_zichang, gmt_create, gmt_modified)
values
(#{id,jdbcType=INTEGER}, #{uniqueNo,jdbcType=VARCHAR}, #{logId,jdbcType=INTEGER},
#{warehouseType,jdbcType=CHAR}, #{warehouseTypeStr,jdbcType=VARCHAR}, #{materialId,jdbcType=INTEGER},
#{stock,jdbcType=INTEGER}, #{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{warehouselId,jdbcType=INTEGER}, #{stockType,jdbcType=CHAR}, #{stockTypeStr,jdbcType=VARCHAR},
#{warehouseId,jdbcType=INTEGER}, #{stockType,jdbcType=CHAR}, #{stockTypeStr,jdbcType=VARCHAR},
#{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR}, #{materialCategory,jdbcType=VARCHAR},
#{newPrice,jdbcType=DECIMAL}, #{warehouseName,jdbcType=VARCHAR}, #{supplierName,jdbcType=VARCHAR},
#{orderNo,jdbcType=VARCHAR}, #{isSelfcontained,jdbcType=BIT}, #{isSelfcontainedStr,jdbcType=VARCHAR},
......@@ -865,7 +865,7 @@
stock = #{stock,jdbcType=INTEGER},
create_user_name = #{createUserName,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
warehousel_id = #{warehouselId,jdbcType=INTEGER},
warehouse_id = #{warehouseId,jdbcType=INTEGER},
stock_type = #{stockType,jdbcType=CHAR},
stock_type_str = #{stockTypeStr,jdbcType=VARCHAR},
material_code = #{materialCode,jdbcType=VARCHAR},
......
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