Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -221,7 +221,7 @@
             </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -612,7 +612,7 @@
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -1979,7 +1979,8 @@
         ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
         ASM.EAS_PRIMARY_ID "easId",
         ASM.SALE_WAREHOUSE "warehouse",
-        ASM.MATERIAL_WEIGHT "materialWeight"
+        ASM.MATERIAL_WEIGHT "materialWeight",
+        TWR.RESULT_NET_WEIGHT "netWeight"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1987,6 +1988,11 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = ASM.MATERIAL_ID
         LEFT JOIN AMS_SALE_ORDER ASO
         ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO