tijia

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

@@ -336,8 +336,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             }
         }
         System.out.println(measureCommission);
-        return 1;
-//        return sendMesToMeasure(measureCommission);
+        //return 1;
+        return sendMesToMeasure(measureCommission);
     }
 
     /**

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

@@ -1421,7 +1421,8 @@
         twr.result_tare_weight_time  "tareWeightTime",
         twr.result_net_weight        "resultNetWeight",
         RC.CARRIER_NAME "carrierName",
-        RL.LINE_NAME "lineName"
+        RL.LINE_NAME "lineName",
+        db.RESULT_FOREIGN_SHIP_NAME "shipName"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
@@ -1441,6 +1442,8 @@
         on air.requirement_id = arp.requirement_id
         left join ams_purchase_order apo
         on apo.purchase_order_id = air.purchase_order_id
+        left join DIL_BATCH DB
+        on db.BATCH_ID = apo.BATCH_ID
         left join rms_supplier rs
         on rs.supplier_id = apo.supplier_unit_id
         left join rms_consignee rce
@@ -1746,7 +1749,8 @@
                TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
                TWR.RESULT_NET_WEIGHT "resultNetWeight",
                RL.LINE_NAME "lineName",
-               RC3.CARRIER_NAME "carrierName"
+               RC3.CARRIER_NAME "carrierName",
+               DB.RESULT_FOREIGN_SHIP_NAME  "shipName"
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OO.ORDER_ID=OOM.ORDER_ID
@@ -1758,6 +1762,8 @@
         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
         LEFT JOIN RMS_CARRIER RC3
         ON RC3.CARRIER_ID=OO.CARRIER_ID
         LEFT JOIN RMS_SUPPLIER RS
@@ -1826,7 +1832,7 @@
         left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
         left join RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         <where>
-            OO.ORDER_TYPE in (11,15,16)  AND  TWR.RESULT_NET_WEIGHT IS NOT NULL
+            OO.ORDER_TYPE = 11  AND  TWR.RESULT_NET_WEIGHT IS NOT NULL
             <if test="orgCode!=null">
                 AND OO.OPTIONER_CODE=#{orgCode}
             </if>
@@ -1860,7 +1866,8 @@
         twr.result_tare_weight_time  "tareWeightTime",
         twr.result_net_weight        "resultNetWeight",
         RC.CARRIER_NAME "carrierName",
-        RL.LINE_NAME "lineName"
+        RL.LINE_NAME "lineName",
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName"
         from omstruck_order oo
         left join omstruck_order_material oom
         on oom.order_id = oo.order_id
@@ -1880,6 +1887,8 @@
         on air.requirement_id = arp.requirement_id
         left join ams_purchase_order apo
         on apo.purchase_order_id = air.purchase_order_id
+        left join DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
         left join rms_supplier rs
         on rs.supplier_id = apo.supplier_unit_id
         left join rms_consignee rce