Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

pom.xml

@@ -112,10 +112,10 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-<!--                        <param>AMSTRUCK_INWARD_REQUIREMENT</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
+                        <param>AMSTRUCK_INWARD_REQUIREMENT</param><!--销售计划物资中间表-->
 <!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
-                        <param>RMS_RECEIVE_PLACE</param><!--销售订单车序号表-->
+<!--                        <param>RMS_RECEIVE_PLACE</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->
 <!--                        <param>AMS_SALE_TRUCKNO_MATERIAL</param>&lt;!&ndash;车序号物资中间表&ndash;&gt;-->
 <!--                            <param>AMS_CONTRACT_TRANSPORT_PRICE</param>-->
                     </tables>

src/main/java/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.java

@@ -42,4 +42,5 @@ public interface AmstruckInwardRequirementMapper extends IBaseMapper<AmstruckInw
 
     List<Map<String, Object>> getPurRequirementList(Map<String, Object> mapValue);
 
+    BigDecimal selectPurOrderId(Integer requirementId);
 }

src/main/java/com/steerinfo/dil/model/AmstruckInwardRequirement.java

@@ -10,13 +10,13 @@ import java.util.Date;
 @ApiModel(value="内转运输需求")
 public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(REQUIREMENT_ID,DECIMAL,38)
+     * 主键ID(REQUIREMENT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal requirementId;
 
     /**
-     * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,38)
+     * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="采购订单ID",required=false)
     private BigDecimal purchaseOrderId;
@@ -34,7 +34,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private String requirementType;
 
     /**
-     * 运力类型ID(CAPACITY_TYPE_ID,DECIMAL,38)
+     * 运力类型ID(CAPACITY_TYPE_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="运力类型ID",required=false)
     private BigDecimal capacityTypeId;
@@ -46,13 +46,13 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private Date requirementTruckTime;
 
     /**
-     * 用车单位ID(REQUIREMENT_SHIPPER_ID,DECIMAL,38)
+     * 用车单位ID(REQUIREMENT_SHIPPER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="用车单位ID",required=false)
     private BigDecimal requirementShipperId;
 
     /**
-     * 费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）(REQUIREMENT_WORK_TYPE,DECIMAL,38)
+     * 费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）(REQUIREMENT_WORK_TYPE,VARCHAR,20)
      */
     @ApiModelProperty(value="费用类别（0：日常内转费，1：推进办费用，2：大修费用，3：新增建设项目，4：外委吊车，5：外委转机，6：环保绿化项目）",required=false)
     private String requirementWorkType;
@@ -64,7 +64,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private String requirementWorkContent;
 
     /**
-     * 作业路径ID(LINE_ID,DECIMAL,38)
+     * 作业路径ID(LINE_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="作业路径ID",required=false)
     private BigDecimal lineId;
@@ -88,13 +88,13 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private String requirementOverlimit;
 
     /**
-     * 用车地点ID(REQUIREMNT_UNIT_ID,DECIMAL,38)
+     * 用车地点ID(REQUIREMNT_UNIT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="用车地点ID",required=false)
     private BigDecimal requiremntUnitId;
 
     /**
-     * 需求状态（0：未下发；1：已下发；2：已接收）(REQUIREMENT_STATUS,DECIMAL,38)
+     * 需求状态（0：未下发；1：已下发；2：已接收）(REQUIREMENT_STATUS,DECIMAL,0)
      */
     @ApiModelProperty(value="需求状态（0：未下发；1：已下发；2：已接收）",required=false)
     private BigDecimal requirementStatus;
@@ -142,11 +142,23 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private BigDecimal requirementUnloadUnitId;
 
     /**
-     * 货位或月台(REQUIREMENT_PLATFORM_ID ,DECIMAL,0)
+     * 货位或月台(REQUIREMENT_PLATFORM_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="货位或月台",required=false)
     private BigDecimal requirementPlatformId;
 
+    /**
+     * 需求连接类型(0：倒库单，1：采购订单)(REQUIREMENT_LINK_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="需求连接类型(0：倒库单，1：采购订单)",required=false)
+    private BigDecimal requirementLinkType;
+
+    /**
+     * 截止日期(DUE_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="截止日期",required=false)
+    private Date dueDate;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -220,7 +232,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     }
 
     public void setRequirementWorkType(String requirementWorkType) {
-        this.requirementWorkType = requirementWorkType;
+        this.requirementWorkType = requirementWorkType == null ? null : requirementWorkType.trim();
     }
 
     public String getRequirementWorkContent() {
@@ -343,6 +355,22 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         this.requirementPlatformId = requirementPlatformId;
     }
 
+    public BigDecimal getRequirementLinkType() {
+        return requirementLinkType;
+    }
+
+    public void setRequirementLinkType(BigDecimal requirementLinkType) {
+        this.requirementLinkType = requirementLinkType;
+    }
+
+    public Date getDueDate() {
+        return dueDate;
+    }
+
+    public void setDueDate(Date dueDate) {
+        this.dueDate = dueDate;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -372,6 +400,8 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", requirementUnloadUnitId=").append(requirementUnloadUnitId);
         sb.append(", requirementPlatformId=").append(requirementPlatformId);
+        sb.append(", requirementLinkType=").append(requirementLinkType);
+        sb.append(", dueDate=").append(dueDate);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/impl/AmstruckInwardRequirementServiceImpl.java

@@ -64,6 +64,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
+        Long dueTime =(Long) mapValue.get("DueTime");
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
         BigDecimal requirementId = amstruckInwardRequirementMapper.selectOtherId();
@@ -82,6 +83,7 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         //用车单位
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));
+        amstruckInwardRequirement.setDueDate(new Date(dueTime));
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
@@ -190,8 +192,15 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         int result = 0;
         for (Map<String,Object> map : requirementIds) {
             Integer requirementId = (Integer) map.get("requirementId");
-            AmstruckInwardRequirement amstruckInwardRequirement = amstruckInwardRequirementMapper.selectByPrimaryKey(new BigDecimal(requirementId));
-            amstruckInwardRequirement.setRequirementStatus(new BigDecimal(2));
+            AmstruckInwardRequirement amstruckInwardRequirement=new AmstruckInwardRequirement();
+            amstruckInwardRequirement.setRequirementId(new BigDecimal(requirementId));
+            //根据需求id进行判断，如果是纯内转，则将状态改为2，如果是采购内转则将状态改为1
+            BigDecimal purOrderId = amstruckInwardRequirementMapper.selectPurOrderId(requirementId);
+            if(purOrderId != null){
+                amstruckInwardRequirement.setRequirementStatus(new BigDecimal(1));
+            }else{
+                amstruckInwardRequirement.setRequirementStatus(new BigDecimal(2));
+            }
             result += amstruckInwardRequirementMapper.updateByPrimaryKeySelective(amstruckInwardRequirement);
         }
         return result;

src/main/java/com/steerinfo/dil/service/impl/AmstruckSporadicOrderServiceImpl.java

@@ -192,6 +192,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
         omstruckOrder.setInsertUsername(userId);
         omstruckOrder.setInsertUpdateRemark("无");
         omstruckOrder.setLineId(lineId);
+        if (map.get("carrierId")!=null) {
+            omstruckOrder.setCarrierId(DataChange.dataToBigDecimal(map.get("carrierId")));
+        }
         //新增总实绩id
         TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
         tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectTmstruckTotalResultId());
@@ -449,9 +452,13 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                 amstruckSporadicOrder.setDispatchStatus(new BigDecimal(1));
                 amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
                 //根据运输订单id查找订单信息
-                Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
                 //生成新的订单
                 OmstruckOrder omstruckOrder=new OmstruckOrder();
+                Map<String, Object> map2 = amstruckSporadicOrderMapper.selectOrderInfo(orderId);
+                BigDecimal carrierId =(BigDecimal) map2.get("carrierId");
+                if (carrierId!=null){
+                    omstruckOrder.setCarrierId(carrierId);
+                }
                 BigDecimal orderId1 = omstruckOrderMapper.selectMaxId();
                 omstruckOrder.setOrderId(orderId1);
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map2.get("orderPlanId")));

src/main/resources/com/steerinfo/dil/mapper/AmstruckInwardRequirementMapper.xml

@@ -9,7 +9,7 @@
         <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
         <result column="REQUIREMENT_TRUCK_TIME" jdbcType="TIMESTAMP" property="requirementTruckTime" />
         <result column="REQUIREMENT_SHIPPER_ID" jdbcType="DECIMAL" property="requirementShipperId" />
-        <result column="REQUIREMENT_WORK_TYPE" jdbcType="DECIMAL" property="requirementWorkType" />
+        <result column="REQUIREMENT_WORK_TYPE" jdbcType="VARCHAR" property="requirementWorkType" />
         <result column="REQUIREMENT_WORK_CONTENT" jdbcType="VARCHAR" property="requirementWorkContent" />
         <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
         <result column="REQUIREMENT_WORK_ENVIRONMENT" jdbcType="VARCHAR" property="requirementWorkEnvironment" />
@@ -25,21 +25,25 @@
         <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
         <result column="REQUIREMENT_UNLOAD_UNIT_ID" jdbcType="DECIMAL" property="requirementUnloadUnitId" />
         <result column="REQUIREMENT_PLATFORM_ID" jdbcType="DECIMAL" property="requirementPlatformId" />
+        <result column="REQUIREMENT_LINK_TYPE" jdbcType="DECIMAL" property="requirementLinkType" />
+        <result column="DUE_DATE" jdbcType="TIMESTAMP" property="dueDate" />
     </resultMap>
     <sql id="columns">
-        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID, 
-    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT, 
-    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT, 
-    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, "REQUIREMENT_PLATFORM_ID"
+        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID,
+    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT,
+    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT,
+    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
+    REQUIREMENT_LINK_TYPE, DUE_DATE
     </sql>
     <sql id="columns_alias">
-        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE, 
-    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE, 
-    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION, 
-    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.REQUIREMENT_UNLOAD_UNIT_ID, t."REQUIREMENT_PLATFORM_ID"
+        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE,
+    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE,
+    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION,
+    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE,
+    t.DUE_DATE
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_INWARD_REQUIREMENT
@@ -70,7 +74,7 @@
             <if test="requirementShipperId != null">
                 and REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
             </if>
-            <if test="requirementWorkType != null">
+            <if test="requirementWorkType != null and requirementWorkType != ''">
                 and REQUIREMENT_WORK_TYPE = #{requirementWorkType}
             </if>
             <if test="requirementWorkContent != null and requirementWorkContent != ''">
@@ -118,6 +122,12 @@
             <if test="requirementPlatformId != null">
                 and REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
             </if>
+            <if test="requirementLinkType != null">
+                and REQUIREMENT_LINK_TYPE = #{requirementLinkType}
+            </if>
+            <if test="dueDate != null">
+                and TO_CHAR(DUE_DATE,'yyyy-MM-dd') = #{dueDate}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -143,8 +153,8 @@
             <if test="requirementShipperId != null">
                 and REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
             </if>
-            <if test="requirementWorkType != null">
-                and REQUIREMENT_WORK_TYPE = #{requirementWorkType}
+            <if test="requirementWorkType != null and requirementWorkType != ''">
+                and REQUIREMENT_WORK_TYPE LIKE '%${requirementWorkType}%'
             </if>
             <if test="requirementWorkContent != null and requirementWorkContent != ''">
                 and REQUIREMENT_WORK_CONTENT LIKE '%${requirementWorkContent}%'
@@ -191,9 +201,15 @@
             <if test="requirementPlatformId != null">
                 and REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
             </if>
+            <if test="requirementLinkType != null">
+                and REQUIREMENT_LINK_TYPE = #{requirementLinkType}
+            </if>
+            <if test="dueDate != null">
+                and TO_CHAR(DUE_DATE,'yyyy-MM-dd') = #{dueDate}
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
         delete from AMSTRUCK_INWARD_REQUIREMENT
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </delete>
@@ -218,7 +234,7 @@
         <if test="requirementShipperId != null">
             or REQUIREMENT_SHIPPER_ID = #{requirementShipperId}
         </if>
-        <if test="requirementWorkType != null">
+        <if test="requirementWorkType != null and requirementWorkType != ''">
             or REQUIREMENT_WORK_TYPE = #{requirementWorkType}
         </if>
         <if test="requirementWorkContent != null and requirementWorkContent != ''">
@@ -266,6 +282,12 @@
         <if test="requirementPlatformId != null">
             or REQUIREMENT_PLATFORM_ID = #{requirementPlatformId}
         </if>
+        <if test="requirementLinkType != null">
+            or REQUIREMENT_LINK_TYPE = #{requirementLinkType}
+        </if>
+        <if test="dueDate != null">
+            or TO_CHAR(DUE_DATE,'yyyy-MM-dd') = '#{dueDate}'
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT (REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER,
@@ -276,16 +298,18 @@
                                                  REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME,
                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                  INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID,
-                                                 "REQUIREMENT_PLATFORM_ID")
+                                                 REQUIREMENT_PLATFORM_ID, REQUIREMENT_LINK_TYPE,
+                                                 DUE_DATE)
         values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{requirementNumber,jdbcType=VARCHAR},
                 #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL}, #{requirementTruckTime,jdbcType=TIMESTAMP},
-                #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=DECIMAL},
+                #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=VARCHAR},
                 #{requirementWorkContent,jdbcType=VARCHAR}, #{lineId,jdbcType=DECIMAL}, #{requirementWorkEnvironment,jdbcType=VARCHAR},
                 #{requirementEstimatedDuration,jdbcType=DECIMAL}, #{requirementOverlimit,jdbcType=VARCHAR},
                 #{requiremntUnitId,jdbcType=DECIMAL}, #{requirementStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{requirementUnloadUnitId,jdbcType=DECIMAL},
-                #{requirementPlatformId,jdbcType=DECIMAL})
+                #{requirementPlatformId,jdbcType=DECIMAL}, #{requirementLinkType,jdbcType=DECIMAL},
+                #{dueDate,jdbcType=TIMESTAMP})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT
@@ -357,7 +381,13 @@
                 REQUIREMENT_UNLOAD_UNIT_ID,
             </if>
             <if test="requirementPlatformId != null">
-                "REQUIREMENT_PLATFORM_ID",
+                REQUIREMENT_PLATFORM_ID,
+            </if>
+            <if test="requirementLinkType != null">
+                REQUIREMENT_LINK_TYPE,
+            </if>
+            <if test="dueDate != null">
+                DUE_DATE,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -383,7 +413,7 @@
                 #{requirementShipperId,jdbcType=DECIMAL},
             </if>
             <if test="requirementWorkType != null">
-                #{requirementWorkType,jdbcType=DECIMAL},
+                #{requirementWorkType,jdbcType=VARCHAR},
             </if>
             <if test="requirementWorkContent != null">
                 #{requirementWorkContent,jdbcType=VARCHAR},
@@ -430,6 +460,12 @@
             <if test="requirementPlatformId != null">
                 #{requirementPlatformId,jdbcType=DECIMAL},
             </if>
+            <if test="requirementLinkType != null">
+                #{requirementLinkType,jdbcType=DECIMAL},
+            </if>
+            <if test="dueDate != null">
+                #{dueDate,jdbcType=TIMESTAMP},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -440,7 +476,7 @@
             CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
             REQUIREMENT_TRUCK_TIME = #{requirementTruckTime,jdbcType=TIMESTAMP},
             REQUIREMENT_SHIPPER_ID = #{requirementShipperId,jdbcType=DECIMAL},
-            REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=DECIMAL},
+            REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=VARCHAR},
             REQUIREMENT_WORK_CONTENT = #{requirementWorkContent,jdbcType=VARCHAR},
             LINE_ID = #{lineId,jdbcType=DECIMAL},
             REQUIREMENT_WORK_ENVIRONMENT = #{requirementWorkEnvironment,jdbcType=VARCHAR},
@@ -455,7 +491,9 @@
             INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             DELETED = #{deleted,jdbcType=DECIMAL},
             REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
-            "REQUIREMENT_PLATFORM_ID" = #{requirementPlatformId,jdbcType=DECIMAL}
+            REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
+            REQUIREMENT_LINK_TYPE = #{requirementLinkType,jdbcType=DECIMAL},
+            DUE_DATE = #{dueDate,jdbcType=TIMESTAMP}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -480,7 +518,7 @@
                 REQUIREMENT_SHIPPER_ID = #{requirementShipperId,jdbcType=DECIMAL},
             </if>
             <if test="requirementWorkType != null">
-                REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=DECIMAL},
+                REQUIREMENT_WORK_TYPE = #{requirementWorkType,jdbcType=VARCHAR},
             </if>
             <if test="requirementWorkContent != null">
                 REQUIREMENT_WORK_CONTENT = #{requirementWorkContent,jdbcType=VARCHAR},
@@ -525,12 +563,18 @@
                 REQUIREMENT_UNLOAD_UNIT_ID = #{requirementUnloadUnitId,jdbcType=DECIMAL},
             </if>
             <if test="requirementPlatformId != null">
-                "REQUIREMENT_PLATFORM_ID" = #{requirementPlatformId,jdbcType=DECIMAL},
+                REQUIREMENT_PLATFORM_ID = #{requirementPlatformId,jdbcType=DECIMAL},
+            </if>
+            <if test="requirementLinkType != null">
+                REQUIREMENT_LINK_TYPE = #{requirementLinkType,jdbcType=DECIMAL},
+            </if>
+            <if test="dueDate != null">
+                DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
             </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
         <include refid="select" />
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </select>
@@ -555,7 +599,8 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
-        REQUIREMENT_UNLOAD_UNIT_ID, "REQUIREMENT_PLATFORM_ID"
+        REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
+        REQUIREMENT_LINK_TYPE, DUE_DATE
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
@@ -563,14 +608,15 @@
         #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.requirementNumber,jdbcType=VARCHAR},
         #{item.requirementType,jdbcType=VARCHAR}, #{item.capacityTypeId,jdbcType=DECIMAL},
         #{item.requirementTruckTime,jdbcType=TIMESTAMP}, #{item.requirementShipperId,jdbcType=DECIMAL},
-        #{item.requirementWorkType,jdbcType=DECIMAL}, #{item.requirementWorkContent,jdbcType=VARCHAR},
+        #{item.requirementWorkType,jdbcType=VARCHAR}, #{item.requirementWorkContent,jdbcType=VARCHAR},
         #{item.lineId,jdbcType=DECIMAL}, #{item.requirementWorkEnvironment,jdbcType=VARCHAR},
         #{item.requirementEstimatedDuration,jdbcType=DECIMAL}, #{item.requirementOverlimit,jdbcType=VARCHAR},
         #{item.requiremntUnitId,jdbcType=DECIMAL}, #{item.requirementStatus,jdbcType=DECIMAL},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
-        #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL}
+        #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL},
+        #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP}
         from dual
     </foreach> )
     </insert>
@@ -607,7 +653,7 @@
         </foreach>
         ,REQUIREMENT_WORK_TYPE=
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
-            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkType,jdbcType=DECIMAL}
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementWorkType,jdbcType=VARCHAR}
         </foreach>
         ,REQUIREMENT_WORK_CONTENT=
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
@@ -665,10 +711,18 @@
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementUnloadUnitId,jdbcType=DECIMAL}
         </foreach>
-        ,"REQUIREMENT_PLATFORM_ID"=
+        ,REQUIREMENT_PLATFORM_ID=
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementPlatformId,jdbcType=DECIMAL}
         </foreach>
+        ,REQUIREMENT_LINK_TYPE=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementLinkType,jdbcType=DECIMAL}
+        </foreach>
+        ,DUE_DATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.dueDate,jdbcType=TIMESTAMP}
+        </foreach>
         where REQUIREMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.requirementId,jdbcType=DECIMAL}
@@ -682,8 +736,9 @@
         </foreach>
     </delete>
     <!-- 友情提示！！！-->
-    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM
@@ -705,7 +760,7 @@
         WHERE  AIR.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
         <if test="orgCode !=null ">
-        AND AIR.INSERT_USERNAME = #{orgCode}
+            AND AIR.INSERT_USERNAME = #{orgCode}
         </if>
         <if test="requirementStatus ==0 ">
             AND AIR.REQUIREMENT_STATUS = 0
@@ -813,7 +868,7 @@
         WHERE AIR.REQUIREMENT_STATUS = #{requirementStatus}
         AND AIR.DELETED = 0
         <if test="orgCode !=null ">
-        AND AIR.INSERT_USERNAME = #{orgCode}
+            AND AIR.INSERT_USERNAME = #{orgCode}
         </if>
         )
         <where>
@@ -941,44 +996,44 @@
     </select>
 
     <select id="selectRequirement" parameterType="DECIMAL" resultType="java.util.Map">
-SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
-       APO.PURCHASE_ORDER_ID              AS "purchaseOrderId",
-       RM.MATERIAL_NAME                   AS "materialName",
-       DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
-       RW.WAREHOUSE_NAME                  AS "wareHouseName",
-       ARM.MATERIAL_WEIGHT                AS "materialWeight",
-       AIR.REQUIREMNT_UNIT_ID             AS "requiremntUnitId",
-       AIR.REQUIREMENT_UNLOAD_UNIT_ID     AS "requirementUnloadUnitId",
-       AIR.REQUIREMENT_TYPE               AS "requirementType",
-       AIR.CAPACITY_TYPE_ID               AS "capacityTypeId",
-       AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-       AIR.REQUIREMENT_SHIPPER_ID         AS "requirementShipperId",
-       AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
-       AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
-       AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
-       AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-       AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
-       RS.SHIPPER_NAME                    AS "receiveUnitName",
-       RSR.SUPPLIER_NAME                  AS "sendUnitName",
-       RWUL.WAREHOUSE_NAME                AS "unWarehouseName"
-  FROM AMSTRUCK_INWARD_REQUIREMENT AIR
-  LEFT JOIN AMS_PURCHASE_ORDER APO
-    ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-  LEFT JOIN RMS_SHIPPER RS
-    ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
-  LEFT JOIN RMS_SUPPLIER RSR
-    ON RSR.SUPPLIER_ID = APO.RECEIVE_UNIT_ID
-  LEFT JOIN DIL_BATCH DB
-    ON APO.BATCH_ID = DB.BATCH_ID
-  LEFT JOIN RMS_MATERIAL RM
-    ON RM.MATERIAL_ID = DB.MATERIAL_ID
-  LEFT JOIN RMS_WAREHOUSE RW
-    ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
-  LEFT JOIN RMS_WAREHOUSE RWUL
-    ON RWUL.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
-  LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-    ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
- WHERE AIR.REQUIREMENT_ID = #{requirementId}
+        SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
+               APO.PURCHASE_ORDER_ID              AS "purchaseOrderId",
+               RM.MATERIAL_NAME                   AS "materialName",
+               DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
+               RW.WAREHOUSE_NAME                  AS "wareHouseName",
+               ARM.MATERIAL_WEIGHT                AS "materialWeight",
+               AIR.REQUIREMNT_UNIT_ID             AS "requiremntUnitId",
+               AIR.REQUIREMENT_UNLOAD_UNIT_ID     AS "requirementUnloadUnitId",
+               AIR.REQUIREMENT_TYPE               AS "requirementType",
+               AIR.CAPACITY_TYPE_ID               AS "capacityTypeId",
+               AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+               AIR.REQUIREMENT_SHIPPER_ID         AS "requirementShipperId",
+               AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+               AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+               AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+               AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+               AIR.REQUIREMENT_OVERLIMIT          AS "requirementOverlimit",
+               RS.SHIPPER_NAME                    AS "receiveUnitName",
+               RSR.SUPPLIER_NAME                  AS "sendUnitName",
+               RWUL.WAREHOUSE_NAME                AS "unWarehouseName"
+        FROM AMSTRUCK_INWARD_REQUIREMENT AIR
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                 LEFT JOIN RMS_SUPPLIER RSR
+                           ON RSR.SUPPLIER_ID = APO.RECEIVE_UNIT_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON APO.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = DB.MATERIAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RWUL
+                           ON RWUL.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        WHERE AIR.REQUIREMENT_ID = #{requirementId}
     </select>
     <!-- 查询批次和采购订单信息 -->
     <select id="getPurchaseIdByBatch" parameterType="java.util.Map" resultType="java.util.Map">
@@ -1030,7 +1085,7 @@ SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
                     "shipperName" like '%${item}%'
                 </foreach>
             </if>
-             <if test="supplierName != null">
+            <if test="supplierName != null">
                 and
                 <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
                     "supplierName" like '%${item}%'
@@ -1057,13 +1112,13 @@ SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
     <!-- 仓库模代框 -->
     <select id="getWareHouse" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT RW.WAREHOUSE_ID           AS "wareHouseId",
-       RW.WAREHOUSE_NAME         AS "wareHouseName",
-       rs.shipper_abbreviation   as "shipperName",
-       rs.shipper_company_branch as "companyBranchName",
-       rs.shipper_branch_factory as "branchFactory"
-       FROM RMS_WAREHOUSE RW
-       left join rms_shipper rs
-       on rs.shipper_id = rw.shipper_id
+        RW.WAREHOUSE_NAME         AS "wareHouseName",
+        rs.shipper_abbreviation   as "shipperName",
+        rs.shipper_company_branch as "companyBranchName",
+        rs.shipper_branch_factory as "branchFactory"
+        FROM RMS_WAREHOUSE RW
+        left join rms_shipper rs
+        on rs.shipper_id = rw.shipper_id
         <where>
             <if test="wareHouseName != null">
                 and
@@ -1204,4 +1259,8 @@ SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
         </where>
         <include refid="orderBy"></include>
     </select>
+    <select id="selectPurOrderId" resultType="java.math.BigDecimal" parameterType="java.lang.Integer">
+        select AIR.PURCHASE_ORDER_ID from AMSTRUCK_INWARD_REQUIREMENT AIR
+        WHERE AIR.REQUIREMENT_ID = #{requirementId}
+    </select>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/AmstruckSporadicOrderMapper.xml

@@ -741,7 +741,8 @@
                OOM.ORDER_MATERIAL_NUMBER "materialNumber",
                OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
                OOM.MATERIAL_PRIORITY "materialPriority",
-               OO.ORDER_TYPE "orderType"
+               OO.ORDER_TYPE "orderType",
+               OO.CARRIER_ID "carrierId"
         from OMSTRUCK_ORDER OO
                  left join OMSTRUCK_ORDER_MATERIAL OOM
                            on OO.ORDER_ID=OOM.ORDER_ID