委托修改

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

@@ -172,19 +172,20 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             measureCommission.put("isDel", false);
             measureCommission.put("isInsert", true);
             measureCommission.put("isRelationEAS", true);
-            measureCommission.put("flowTo ", "出厂钢材");
-            measureCommission.put("theoryWeight", 3077);
+            measureCommission.put("flowTo", "出厂钢材");
             Object isPoundSale = measureCommission.get("isPoundSale");
+            measureCommission.remove("isPoundSale");
             if(isPoundSale != null){
                 if(DataChange.dataToBigDecimal(isPoundSale).intValue() == 0){
                     measureCommission.put("deliveryMethod", "磅重交货");
+                    measureCommission.remove("meterWeight");
                 }else {
                     measureCommission.put("deliveryMethod", "理重交货");
+                    BigDecimal meterWeight = DataChange.dataToBigDecimal(measureCommission.get("meterWeight")).divide(new BigDecimal(1000));
+                    measureCommission.remove("meterWeight");
+                    measureCommission.put("theoryWeight", meterWeight.setScale(4, BigDecimal.ROUND_HALF_UP));//理重除1000保留四位小数
                 }
-            }else { //如果为空 则默认理重
-                measureCommission.put("deliveryMethod", "理重交货");
             }
-            measureCommission.put("steelyardNum", "罗棒好帅");
             //查询已经计量物资
             Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
             if(materialNum >= 1){
@@ -193,7 +194,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("IsAssembly", false);
             }
         }
-        System.out.println(measureCommission);
         return sendMesToMeasure(measureCommission);
     }
 

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

@@ -1298,30 +1298,43 @@
     </select>
 
     <select id="getSteelMeasureCommission" parameterType="map" resultType="map">
-        select ASO.SALE_NUMBER                                      "purchaseOrder",
-               OO.ORDER_NUMBER                                      "transportNum",
-               RM.MATERIAL_ID                                       "materialId",
-               RM.MATERIAL_NAME                                     "materiaName",
-               concat(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
-               RS.SHIPPER_NAME                                      "sendUnit",
-               OOM.ORDER_MATERIAL_WEIGHT                           "packagesNum",
-               RCON.CONSIGNEE_COMPANY_NAME                            "ReceivUnit",
-               RC.CAPACITY_NUMBER                                  "carNum",
-               ASO.SALE_REMARK                                      "shipNum",
-               OO.INSERT_UPDATE_REMARK                              "demo",
-               ASM.EAS_PRIMARY_ID                                   "FLID",
-               ASM.IS_POUND_SALE                                    "isPoundSale"
-        from OMSTRUCK_ORDER OO
-                 left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID
-                 left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
-                 left join AMS_SALE_ORDER_MATERIAL ASOM on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                 left join AMS_SALE_ORDER ASO on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                 left join AMS_SALE_MATERIAL ASM on ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
-                 left join RMS_SHIPPER RS on ASO.SHIPPER_ID = RS.SHIPPER_ID
-                 left join RMS_CONSIGNEE RCON on ASO.RECEIVE_ID = RCON.CONSIGNEE_ID
-                 left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
-
-        where OO.ORDER_ID = #{orderId} and OOM.MATERIAL_ID = #{materialId} and ASM.MATERIAL_ID = #{materialId}
+        select *
+        from (
+                 select ASO.SALE_NUMBER                                      "purchaseOrder",
+                        OO.ORDER_NUMBER                                      "transportNum",
+                        RM.MATERIAL_ID                                       "materialId",
+                        RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ') ' ||
+                        RM.MATERIAL_NAME                                     "materiaName",
+                        CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL) "goodsType",
+                        RS.SHIPPER_NAME                                      "sendUnit",
+                        OOM.ORDER_MATERIAL_NUMBER                            "packagesNum",
+                        RCON.CONSIGNEE_COMPANY_NAME                          "ReceivUnit",
+                        RC.CAPACITY_NUMBER                                   "carNum",
+                        ASO.SALE_REMARK                                      "shipNum",
+                        OO.INSERT_UPDATE_REMARK                              "demo",
+                        ASM.EAS_PRIMARY_ID                                   "FLID",
+                        MAORTC.TRUCK_CALCULATE_NUMBER                        "steelyardNum",
+                        ASM.METER_WEIGHT                                     "meterWeight",
+                        ASM.IS_POUND_SALE                                    "isPoundSale"
+                 from OMSTRUCK_ORDER OO
+                          left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID
+                          left join RMS_MATERIAL RM on OOM.MATERIAL_ID = RM.MATERIAL_ID
+                          left join AMS_SALE_ORDER_MATERIAL ASOM on OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                          left join AMS_SALE_ORDER ASO on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                          left join AMS_SALE_MATERIAL ASM on ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                          left join RMS_SHIPPER RS on ASO.SHIPPER_ID = RS.SHIPPER_ID
+                          left join RMS_CONSIGNEE RCON on ASO.RECEIVE_ID = RCON.CONSIGNEE_ID
+                          left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_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
+                          left join RMS_TRUCK_CALCULATE MAORTC on TWR.RESULT_GROSS_PLACE_ID = MAORTC.TRUCK_CALCULATE_ID
+                 where OO.ORDER_ID = #{orderId}
+                   and OOM.MATERIAL_ID = #{materialId}
+                   and ASM.MATERIAL_ID = #{materialId}
+                   and TWR.RESULT_NET_WEIGHT is null
+                 order by TWR.TARE_SEGMENT_SQE
+            )
+        where rownum = 1
 
     </select>