'short转DECIMAL'

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

@@ -30,4 +30,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     int closeOrderNotIn(BigDecimal saleOrderId);
     // 得到仓库集合
     List<Map<String,Object>> getWareHouse(BigDecimal saleOrderId);
+    // 将不可作业的运输订单改为已接收状态
+    int updateTruckOrderStatus(BigDecimal saleOrderId);
 }

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

@@ -185,7 +185,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from AMS_SALE_ORDER
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </delete>
@@ -509,7 +509,7 @@
     </set>
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </select>
@@ -687,7 +687,8 @@
            RM.MATERIAL_NAME     AS "materialName",
            ASM.SALE_MATERIAL_ID AS "stEntryId",
            ASM.IS_POUND_SALE    AS "isPoundSale",
-           ASM.STEEL_METER      AS "forChangdu"
+           ASM.STEEL_METER      AS "forChangdu",
+           ASM.EAS_PRIMARY_ID   AS "easPrimatyId"
     FROM AMS_SALE_MATERIAL ASM
            LEFT JOIN RMS_MATERIAL RM
                      ON RM.MATERIAL_ID = ASM.MATERIAL_ID
@@ -734,4 +735,17 @@
     WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
     AND ASM.SALE_WAREHOUSE IS NOT NULL
   </select>
+
+  <update id="updateTruckOrderStatus" parameterType="DECIMAL">
+    UPDATE OMSTRUCK_ORDER OO
+    SET OO.ORDER_STATUS = 5
+    WHERE OO.ORDER_ID IN (
+      SELECT OO.ORDER_ID
+      FROM OMSTRUCK_ORDER OO
+             LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                       ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+      WHERE OO.ORDER_TYPE = 1
+        AND OO.ORDER_STATUS = 10
+        AND ASOM.SALE_ORDER_ID = #{saleOrderId})
+  </update>
 </mapper>

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

@@ -97,7 +97,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from AMS_SALE_TRUCKNO_MATERIAL
     where TRUCKNO_MATERIAL_ID = #{trucknoMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -255,7 +255,7 @@
     </set>
     where TRUCKNO_MATERIAL_ID = #{trucknoMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where TRUCKNO_MATERIAL_ID = #{trucknoMaterialId,jdbcType=DECIMAL}
   </select>

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

@@ -81,7 +81,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from DIL_BATCH
     where BATCH_ID = #{batchId,jdbcType=DECIMAL}
   </delete>
@@ -211,7 +211,7 @@
     </set>
     where BATCH_ID = #{batchId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where BATCH_ID = #{batchId,jdbcType=DECIMAL}
   </select>

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

@@ -304,7 +304,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from RMS_CARRIER
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </delete>
@@ -848,7 +848,7 @@
     </set>
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
   </select>

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

@@ -95,7 +95,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from RMS_MATERIAL_TYPE
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </delete>
@@ -253,7 +253,7 @@
     </set>
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
   </select>

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

@@ -178,7 +178,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from TMSTRAIN_WEIGHT_RESULT
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </delete>
@@ -487,7 +487,7 @@
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>

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

@@ -118,7 +118,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from TMSTRUCK_ENFACTORY_RESULT
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </delete>
@@ -317,7 +317,7 @@
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select"/>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>

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

@@ -118,7 +118,7 @@
       </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from TMSTRUCK_LEAVE_FACTORY_RESULT
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </delete>
@@ -317,7 +317,7 @@
     </set>
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     where RESULT_ID = #{resultId,jdbcType=DECIMAL}
   </select>

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

@@ -185,7 +185,7 @@
             </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
         delete from TMSTRUCK_WEIGHT_RESULT
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </delete>
@@ -509,7 +509,7 @@
         </set>
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
         <include refid="select"/>
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </select>