一磅过“

src/main/java/com/steerinfo/dil/controller/OmstruckOrderSeparateController.java

@@ -301,7 +301,7 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
             if (stringObjectMap.get("netWeight")==null){
                 continue;
             }
-            String netWeight1 = (String) stringObjectMap.get("netWeight");
+            String netWeight1 = "" + stringObjectMap.get("netWeight");
             String[] split = netWeight1.split("、");
             if (split.length<=1){
                 if (contains(matrialList,materialName)){

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

@@ -582,7 +582,14 @@
                                    RM.MATERIAL_NAME                               "materialName",
                                    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpa",
                                    OTO.ORDER_NO                                   "orderNum",
-                                   TWR.RESULT_NET_WEIGHT                          "materialWeight",
+                                   TWB .WEIGHT_BATCH_ID "weightBatchId",
+                                   (
+                                    CASE
+                                    WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                                    THEN TWB.BATCH_NET_WEIGHT
+                                    ELSE TWR.RESULT_NET_WEIGHT
+                                    END
+                                   )  "materialWeight",
                                    to_char(OTO.OUTSTATION_TIME,'yyyy-mm-dd')      "OutStation",
                                    to_char(TUR.RESULT_END_TIME,'yyyy-mm-dd')       "EnStation",
                                    to_char(ASO.INSERT_TIME,'yyyy-mm-dd')        "orderTime",
@@ -647,6 +654,7 @@
                           LEFT JOIN WMSP_GRID_MATERIAL  WGM ON WGM.GRID_ID = RPG.GRID_ID
                                     and wgm.MATERIAL_ID = rm.MATERIAL_ID
                           LEFT JOIN RMS_WAREHOUSE   RW ON RW.WAREHOUSE_ID = OTO.WAREHOUSE_ID
+                          LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
                           WHERE ASO.SALE_TYPE = 4
                           AND OO.ORDER_STATUS IN (2,5)
                           <if test="oneDate != null">

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

@@ -494,12 +494,28 @@
         end
         )
         AS                                                                   "weightNum",
-        (   SELECT
-        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
-        FROM TMSTRUCK_WEIGHT_RESULT TWR
-        JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-        WHERE TTR.ORDER_ID = OO.ORDER_ID and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        (
+            SELECT
+                (
+                    CASE
+                        WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                            THEN TWB.BATCH_NET_WEIGHT
+                        ELSE TWR.RESULT_NET_WEIGHT
+                        END
+                    )
+            FROM AMS_SALE_ORDER_MATERIAL ASOM
+                     LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                               ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                     LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                               ON ADSO .SALE_ORDER_MATERIAL_ID = ASOM .SALE_ORDER_MATERIAL_ID
+                     LEFT JOIN AMS_SALE_MATERIAL ASM
+                               ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                     LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                               ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
+                     LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
+                               ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
+            WHERE ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+              and TWR.MATERIAL_ID = OOM.MATERIAL_ID
         )                                                                    "netWeight"
         FROM OMSTRUCK_ORDER OO
         left join RMS_CAPACITY RC