Commit 3c7af2e9 by guanzhenshan

调拨明细增加是否异常字段

parent ff95ad72
...@@ -140,4 +140,7 @@ public class TransferStreamPOJO { ...@@ -140,4 +140,7 @@ public class TransferStreamPOJO {
@JSONField(name = "TransportType") @JSONField(name = "TransportType")
private String transportType; private String transportType;
@JSONField(name="isException")
private Boolean isexception;
} }
...@@ -41,6 +41,7 @@ public class TransferDetailsServiceImpl { ...@@ -41,6 +41,7 @@ public class TransferDetailsServiceImpl {
Response response = null; Response response = null;
String responseStr = null; String responseStr = null;
try { try {
//String str = JSON.toJSONString(map);
RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map)); RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(map));
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url) .url(url)
......
...@@ -7,10 +7,10 @@ import java.time.LocalDateTime; ...@@ -7,10 +7,10 @@ import java.time.LocalDateTime;
public class TransferDetailsTest { public class TransferDetailsTest {
@Test @Test
public void test() { public void test() {
JobPointLog jobPointLog = new JobPointLog(); JobPointLog jobPointLog = new JobPointLog();//2020-06-15 09:07:01
jobPointLog.setStartTime(LocalDateTime.of(2019,01,7,0,0,0)); jobPointLog.setStartTime(LocalDateTime.of(2020,06,15,0,7,1));
jobPointLog.setEndTime(LocalDateTime.of(2019,01,8,0,0,0)); jobPointLog.setEndTime(LocalDateTime.of(2020,06,16,0,7,1));
jobPointLog.setType(12); jobPointLog.setType(1);
jobPointLog.setIntervalTime(1); jobPointLog.setIntervalTime(1);
jobPointLog.setPageIndex(1); jobPointLog.setPageIndex(1);
jobPointLog.setPageSize(1000); jobPointLog.setPageSize(1000);
......
...@@ -150,6 +150,8 @@ public class DcBaseTransferBale { ...@@ -150,6 +150,8 @@ public class DcBaseTransferBale {
*/ */
private String transportType; private String transportType;
private Boolean isexception;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_transfer_bale * This method corresponds to the database table dc_base_transfer_bale
......
...@@ -141,6 +141,8 @@ public class DcBaseTransferComplete { ...@@ -141,6 +141,8 @@ public class DcBaseTransferComplete {
*/ */
private String sourceWarehouseCode; private String sourceWarehouseCode;
private Boolean isexception;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_transfer_complete * This method corresponds to the database table dc_base_transfer_complete
......
...@@ -132,6 +132,8 @@ public class DcBaseTransferDelivery { ...@@ -132,6 +132,8 @@ public class DcBaseTransferDelivery {
*/ */
private Integer companyId; private Integer companyId;
private Boolean isexception;
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
......
...@@ -141,6 +141,8 @@ public class DcBaseTransferInbound { ...@@ -141,6 +141,8 @@ public class DcBaseTransferInbound {
*/ */
private String sourceWarehouseCode; private String sourceWarehouseCode;
private Boolean isexception;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_transfer_inbound * This method corresponds to the database table dc_base_transfer_inbound
......
...@@ -141,6 +141,8 @@ public class DcBaseTransferPlan { ...@@ -141,6 +141,8 @@ public class DcBaseTransferPlan {
*/ */
private String sourceWarehouseCode; private String sourceWarehouseCode;
private Boolean isexception;
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
......
...@@ -123,6 +123,8 @@ public class DcBaseTransferTransit { ...@@ -123,6 +123,8 @@ public class DcBaseTransferTransit {
*/ */
private Boolean deleted; private Boolean deleted;
private Boolean isexception;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_transfer_transit * This method corresponds to the database table dc_base_transfer_transit
......
...@@ -132,6 +132,8 @@ public class DcBaseTransferVerify { ...@@ -132,6 +132,8 @@ public class DcBaseTransferVerify {
*/ */
private LocalDateTime estimatedArrivalTime; private LocalDateTime estimatedArrivalTime;
private Boolean isexception;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_transfer_verify * This method corresponds to the database table dc_base_transfer_verify
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<result column="company_id" jdbcType="INTEGER" property="companyId" /> <result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" /> <result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" />
<result column="transport_type" jdbcType="VARCHAR" property="transportType" /> <result column="transport_type" jdbcType="VARCHAR" property="transportType" />
<result column="isexception" jdbcType="BIT" property="isexception" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -225,6 +226,9 @@ ...@@ -225,6 +226,9 @@
<if test="transportType != null"> <if test="transportType != null">
transport_type, transport_type,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -275,6 +279,9 @@ ...@@ -275,6 +279,9 @@
<if test="transportType != null"> <if test="transportType != null">
#{transportType,jdbcType=VARCHAR}, #{transportType,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferBaleExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferBaleExample" resultType="java.lang.Long">
...@@ -342,6 +349,9 @@ ...@@ -342,6 +349,9 @@
<if test="record.transportType != null"> <if test="record.transportType != null">
transport_type = #{record.transportType,jdbcType=VARCHAR}, transport_type = #{record.transportType,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="company_id" jdbcType="INTEGER" property="companyId" /> <result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" /> <result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" />
<result column="isexception" jdbcType="BIT" property="isexception" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -220,6 +221,9 @@ ...@@ -220,6 +221,9 @@
<if test="sourceWarehouseCode != null"> <if test="sourceWarehouseCode != null">
source_warehouse_code, source_warehouse_code,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -267,6 +271,9 @@ ...@@ -267,6 +271,9 @@
<if test="sourceWarehouseCode != null"> <if test="sourceWarehouseCode != null">
#{sourceWarehouseCode,jdbcType=VARCHAR}, #{sourceWarehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferCompleteExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferCompleteExample" resultType="java.lang.Long">
...@@ -331,6 +338,9 @@ ...@@ -331,6 +338,9 @@
<if test="record.sourceWarehouseCode != null"> <if test="record.sourceWarehouseCode != null">
source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR}, source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="company_id" jdbcType="INTEGER" property="companyId" /> <result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" /> <result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" />
<result column="isexception" jdbcType="BIT" property="isexception" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -220,6 +221,9 @@ ...@@ -220,6 +221,9 @@
<if test="sourceWarehouseCode != null"> <if test="sourceWarehouseCode != null">
source_warehouse_code, source_warehouse_code,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -267,6 +271,9 @@ ...@@ -267,6 +271,9 @@
<if test="sourceWarehouseCode != null"> <if test="sourceWarehouseCode != null">
#{sourceWarehouseCode,jdbcType=VARCHAR}, #{sourceWarehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferDeliveryExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferDeliveryExample" resultType="java.lang.Long">
...@@ -331,6 +338,9 @@ ...@@ -331,6 +338,9 @@
<if test="record.sourceWarehouseCode != null"> <if test="record.sourceWarehouseCode != null">
source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR}, source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="company_id" jdbcType="INTEGER" property="companyId" /> <result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" /> <result column="source_warehouse_code" jdbcType="VARCHAR" property="sourceWarehouseCode" />
<result column="isexception" jdbcType="BIT" property="isexception" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -220,6 +221,9 @@ ...@@ -220,6 +221,9 @@
<if test="sourceWarehouseCode != null"> <if test="sourceWarehouseCode != null">
source_warehouse_code, source_warehouse_code,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -267,6 +271,9 @@ ...@@ -267,6 +271,9 @@
<if test="sourceWarehouseCode != null"> <if test="sourceWarehouseCode != null">
#{sourceWarehouseCode,jdbcType=VARCHAR}, #{sourceWarehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferInboundExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferInboundExample" resultType="java.lang.Long">
...@@ -331,6 +338,9 @@ ...@@ -331,6 +338,9 @@
<if test="record.sourceWarehouseCode != null"> <if test="record.sourceWarehouseCode != null">
source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR}, source_warehouse_code = #{record.sourceWarehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
...@@ -225,6 +225,9 @@ ...@@ -225,6 +225,9 @@
<if test="transportType != null"> <if test="transportType != null">
transport_type, transport_type,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -275,6 +278,9 @@ ...@@ -275,6 +278,9 @@
<if test="transportType != null"> <if test="transportType != null">
#{transportType,jdbcType=VARCHAR}, #{transportType,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferPlanExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferPlanExample" resultType="java.lang.Long">
...@@ -342,6 +348,9 @@ ...@@ -342,6 +348,9 @@
<if test="record.transportType != null"> <if test="record.transportType != null">
transport_type = #{record.transportType,jdbcType=VARCHAR}, transport_type = #{record.transportType,jdbcType=VARCHAR},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<result column="sku_title" jdbcType="VARCHAR" property="skuTitle" /> <result column="sku_title" jdbcType="VARCHAR" property="skuTitle" />
<result column="transfer_key" jdbcType="INTEGER" property="transferKey" /> <result column="transfer_key" jdbcType="INTEGER" property="transferKey" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="isexception" jdbcType="BIT" property="isexception" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -210,6 +211,9 @@ ...@@ -210,6 +211,9 @@
<if test="deleted != null"> <if test="deleted != null">
deleted, deleted,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -251,6 +255,9 @@ ...@@ -251,6 +255,9 @@
<if test="deleted != null"> <if test="deleted != null">
#{deleted,jdbcType=BIT}, #{deleted,jdbcType=BIT},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferTransitExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferTransitExample" resultType="java.lang.Long">
...@@ -309,6 +316,9 @@ ...@@ -309,6 +316,9 @@
<if test="record.deleted != null"> <if test="record.deleted != null">
deleted = #{record.deleted,jdbcType=BIT}, deleted = #{record.deleted,jdbcType=BIT},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<result column="transfer_key" jdbcType="INTEGER" property="transferKey" /> <result column="transfer_key" jdbcType="INTEGER" property="transferKey" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="estimated_arrival_time" jdbcType="TIMESTAMP" property="estimatedArrivalTime" /> <result column="estimated_arrival_time" jdbcType="TIMESTAMP" property="estimatedArrivalTime" />
<result column="isexception" jdbcType="BIT" property="isexception" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -214,6 +215,9 @@ ...@@ -214,6 +215,9 @@
<if test="estimatedArrivalTime != null"> <if test="estimatedArrivalTime != null">
estimated_arrival_time, estimated_arrival_time,
</if> </if>
<if test="record.isexception != null">
isexception,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -258,6 +262,9 @@ ...@@ -258,6 +262,9 @@
<if test="estimatedArrivalTime != null"> <if test="estimatedArrivalTime != null">
#{estimatedArrivalTime,jdbcType=TIMESTAMP}, #{estimatedArrivalTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.isexception != null">
#{isexception,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferVerifyExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseTransferVerifyExample" resultType="java.lang.Long">
...@@ -319,6 +326,9 @@ ...@@ -319,6 +326,9 @@
<if test="record.estimatedArrivalTime != null"> <if test="record.estimatedArrivalTime != null">
estimated_arrival_time = #{record.estimatedArrivalTime,jdbcType=TIMESTAMP}, estimated_arrival_time = #{record.estimatedArrivalTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.isexception != null">
isexception = #{record.isexception,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
......
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