修改

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderMaterialController.java

@@ -251,6 +251,9 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
     @PostMapping("dispatchTruckOrderByCarrier")
     public RESTfulResult dispatchTruckOrderByCarrier(@RequestBody Map<String,Object> mapValue){
         int result = amsSaleOrderMaterialService.dispatchTruckOrderByCarrier(mapValue);
+        if (result==-1){
+            return failed("您的账号还没有绑定组织,请联系自动化部");
+        }
         return success(result);
     }
 

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

@@ -16,9 +16,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal orderId;
 
     /**
-     * 销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
+     * 车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
+    @ApiModelProperty(value="车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
     private BigDecimal orderPlanId;
 
     /**
@@ -165,6 +165,12 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="司机电话号码",required=false)
     private String driverTel;
 
+    /**
+     * 操作人员组织(OPTIONER_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="操作人员组织",required=false)
+    private String optionerCode;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -385,6 +391,14 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.driverTel = driverTel == null ? null : driverTel.trim();
     }
 
+    public String getOptionerCode() {
+        return optionerCode;
+    }
+
+    public void setOptionerCode(String optionerCode) {
+        this.optionerCode = optionerCode == null ? null : optionerCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -417,6 +431,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", tripId=").append(tripId);
         sb.append(", orderPrintStatus=").append(orderPrintStatus);
         sb.append(", driverTel=").append(driverTel);
+        sb.append(", optionerCode=").append(optionerCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -626,6 +626,12 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
              运输订单
              */
             OmstruckOrder omstruckOrder = new OmstruckOrder();
+            String orgCode =(String) mapValue.get("orgCode");
+            if (orgCode==null||orgCode.equals("")){
+                return -1;
+            }else {
+                omstruckOrder.setOptionerCode(orgCode);
+            }
             // 运输订单主键
             BigDecimal orderId = omstruckOrderMapper.selectMaxId();
             omstruckOrder.setOrderId(orderId);

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

@@ -28,13 +28,14 @@
         <result column="TRIP_ID" jdbcType="VARCHAR" property="tripId" />
         <result column="ORDER_PRINT_STATUS" jdbcType="DECIMAL" property="orderPrintStatus" />
         <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
+        <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
     </resultMap>
     <sql id="columns">
         ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
     ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
     ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
-    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE
     </sql>
     <sql id="columns_alias">
         t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
@@ -42,7 +43,7 @@
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
     t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID,
     t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
-    t.DRIVER_TEL
+    t.DRIVER_TEL, t.OPTIONER_CODE
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
@@ -130,6 +131,9 @@
             <if test="driverTel != null and driverTel != ''">
                 and DRIVER_TEL = #{driverTel}
             </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE = #{optionerCode}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -212,9 +216,12 @@
             <if test="driverTel != null and driverTel != ''">
                 and DRIVER_TEL LIKE '%${driverTel}%'
             </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE LIKE '%${optionerCode}%'
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -296,6 +303,9 @@
         <if test="driverTel != null and driverTel != ''">
             or DRIVER_TEL = #{driverTel}
         </if>
+        <if test="optionerCode != null and optionerCode != ''">
+            or OPTIONER_CODE = #{optionerCode}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -306,8 +316,8 @@
                                     DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
                                     LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
                                     DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
-                                    TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL
-        )
+                                    TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
+                                    OPTIONER_CODE)
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
                 #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
@@ -316,8 +326,8 @@
                 #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
                 #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
-                #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR}
-               )
+                #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
+                #{optionerCode,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -400,6 +410,9 @@
             <if test="driverTel != null">
                 DRIVER_TEL,
             </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -480,6 +493,9 @@
             <if test="driverTel != null">
                 #{driverTel,jdbcType=VARCHAR},
             </if>
+            <if test="optionerCode != null">
+                #{optionerCode,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -508,7 +524,8 @@
             CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
             TRIP_ID = #{tripId,jdbcType=VARCHAR},
             ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
-            DRIVER_TEL = #{driverTel,jdbcType=VARCHAR}
+            DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
+            OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -589,10 +606,13 @@
             <if test="driverTel != null">
                 DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
             </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -617,7 +637,7 @@
         LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
         DRIVER_CONFIRMATION, PRICE_ID,
         CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
-        DRIVER_TEL)
+        DRIVER_TEL, OPTIONER_CODE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.orderId,jdbcType=DECIMAL},
@@ -631,7 +651,7 @@
         #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
         #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
         #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
-        #{item.driverTel,jdbcType=VARCHAR} from dual
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -741,6 +761,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.driverTel,jdbcType=VARCHAR}
         </foreach>
+        ,OPTIONER_CODE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.optionerCode,jdbcType=VARCHAR}
+        </foreach>
         where ORDER_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.orderId,jdbcType=DECIMAL}