'汽运执行bug'

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

@@ -27,4 +27,7 @@ public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQuality
 
     //内转查询质检作业
     List<Map<String, Object>> getInwardQualityResult(Map<String, Object> map);
+
+    // 查询销售质检作业
+    List<Map<String, Object>> getSaleQualityResult(Map<String, Object> map);
 }

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

@@ -41,11 +41,9 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
         Integer orderType = (Integer)map.get("orderTypee");
         switch (orderType){
             case 1:
-                break;
             case 2:
-                break;
             case 3:
-                break;
+                return tmstruckQualityResultMapper.getSaleQualityResult(map);// apiId:413
             case 4:
                 break;
             case 5:

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

@@ -721,8 +721,10 @@
         ASO.SALE_NUMBER
         FROM
         -- 销售订单
-        AMS_SALE_ORDER ASO
-        WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        AMS_SALE_ORDER_MATERIAL ASOM
+        JOIN AMS_SALE_ORDER ASO
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
         )
         -- 运输订单类型等于2，3的查询发运计划表
         WHEN OO.ORDER_TYPE IN ( 2, 3 )
@@ -744,11 +746,13 @@
         -- 发货单位
         RS.SHIPPER_NAME
         FROM
-        -- 销售订单
-        AMS_SALE_ORDER ASO
         -- 托运人
-        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
-        WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        AMS_SALE_ORDER_MATERIAL ASOM
+        JOIN AMS_SALE_ORDER ASO
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
         )
         -- 运输订单类型等于2，3的查询发运计划表
         WHEN OO.ORDER_TYPE IN ( 2, 3 )
@@ -769,13 +773,14 @@
         THEN(
         SELECT
         -- 收货单位
-        RS.SUPPLIER_NAME
+        RC.CONSIGNEE_COMPANY_NAME
         FROM
-        -- 销售订单
-        AMS_SALE_ORDER ASO
-        -- 托运人
-        LEFT JOIN RMS_SUPPLIER RS ON ASO.SHIPPER_ID = RS.SUPPLIER_ID
-        WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        AMS_SALE_ORDER_MATERIAL ASOM
+        JOIN AMS_SALE_ORDER ASO
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        JOIN RMS_CONSIGNEE RC
+        ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
         )
         -- 运输订单类型等于2，3的查询发运计划表
         WHEN OO.ORDER_TYPE IN ( 2, 3 )

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

@@ -634,4 +634,99 @@
     </where>
     <include refid="orderBy"></include>
   </select>
+
+  <!-- 查询销售废钢材物资单拼 -->
+  <select id="getSaleQualityResult" parameterType="java.util.Map" resultType="java.util.Map" >
+    SELECT *
+    FROM (
+           SELECT ASO.SALE_NUMBER AS "saleNumber",
+                  RM.MATERIAL_NAME AS "materialName",
+                  OO.ORDER_NUMBER AS "orderNumber",
+                  RCA.CAPACITY_NUMBER AS "capacityNumber",
+                  TQR.RESULT_ISSAMPLING AS "resultIssampling",
+                  TQR.RESULT_DEDUCTION AS "resultDeduction",
+                  TQR.RESULT_DEDUCTION_DESCRIPTION AS "resultDeductionDescription",
+                  RW.WAREHOUSE_NAME AS "warehouseName",
+                  TQR.RESULT_SAMPLING_TIME AS "insertTime",
+                  TQR.RESULT_ID AS "resultId"
+           FROM TMSTRUCK_QUALITY_RESULT TQR
+                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                            ON TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
+                  LEFT JOIN OMSTRUCK_ORDER OO
+                            ON OO.ORDER_ID = TTR.ORDER_ID
+                  LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                            ON OOM.ORDER_ID = OO.ORDER_ID
+                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                  LEFT JOIN AMS_SALE_ORDER ASO
+                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                  LEFT JOIN RMS_MATERIAL RM
+                            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                  LEFT JOIN RMS_SHIPPER RS
+                            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                  LEFT JOIN RMS_CONSIGNEE RCO
+                            ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
+                  LEFT JOIN RMS_CAPACITY RCA
+                            ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+                  LEFT JOIN RMS_WAREHOUSE RW
+                  ON RW.WAREHOUSE_ID = TQR.RESULT_SAMPLING_POINT_ID
+           WHERE OO.ORDER_TYPE = #{orderTypee}
+         )
+    <where>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialName != null">
+        and
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="orderNumber != null">
+        and
+        <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+          "orderNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="capacityNumber != null">
+        and
+        <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+          "capacityNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultIssampling != null">
+        and
+        <foreach collection="resultIssampling" item="item" open="(" separator="or" close=")">
+          "resultIssampling" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultDeduction != null">
+        and
+        <foreach collection="resultDeduction" item="item" open="(" separator="or" close=")">
+          "resultDeduction" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultDeductionDescription != null">
+        and
+        <foreach collection="resultDeductionDescription" item="item" open="(" separator="or" close=")">
+          "resultDeductionDescription" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="warehouseName != null">
+        and
+        <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+          "warehouseName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="insertTime != null">
+        and
+        <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+          "insertTime" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderBy"></include>
+  </select>
 </mapper>

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

@@ -1108,7 +1108,7 @@
         RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
         OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
-        RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+        --         RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
         TWR.RESULT_POUND_NO "resultPoundNo",
@@ -1120,18 +1120,20 @@
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         left join AMS_SALE_ORDER ASO
-        on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+        on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
-        left join RMS_MATERIAL_STEEL RMS
-        on OOM.MATERIAL_ID = RMS.MATERIAL_STEEL_ID
+        --         left join RMS_MATERIAL_STEEL RMS
+        --         on OOM.MATERIAL_ID = RMS.MATERIAL_STEEL_ID
         left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = RMS.MATERIAL_ID
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_SHIPPER RS
         on RS.SHIPPER_ID = ASO.SHIPPER_ID
         left join RMS_CONSIGNEE RCON
@@ -1237,7 +1239,7 @@
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
         TWR.RESULT_POUND_NO "resultPoundNo",
         TWR.INSERT_UPDATE_REMARK "insertUpdateRemark",
-        RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
+        --         RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoreticalWeight",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RS.SHIPPER_NAME "shipperName"
         from TMSTRUCK_WEIGHT_RESULT TWR
@@ -1245,18 +1247,20 @@
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         left join AMS_SALE_ORDER ASO
-        on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+        on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
         on OOM.ORDER_ID = OO.ORDER_ID
-        left join RMS_MATERIAL_STEEL RMS
-        on RMS.MATERIAL_STEEL_ID = OOM.MATERIAL_ID
+        --         left join RMS_MATERIAL_STEEL RMS
+        --         on RMS.MATERIAL_STEEL_ID = OOM.MATERIAL_ID
         left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = RMS.MATERIAL_ID
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_SHIPPER RS
         on RS.SHIPPER_ID = ASO.SHIPPER_ID
         left join RMS_CONSIGNEE RCON