提交送货单的代码

src/main/java/com/steerinfo/dil/service/ITmstruckSelfMachineService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,8 +54,10 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
                 BigDecimal materialid = (BigDecimal) map1.get("materialid");
                 String materialName =(String) map1.get("materialName");
                 map.put("materialName",materialName);
-                //判断是否为盘螺
-                if (materialName.contains("盘螺")||materialName.contains("螺纹钢")||materialName.contains("盘元")){
+                //判断是实重还是理重的标志
+                BigDecimal isPoundSale = (BigDecimal) map1.get("isPoundSale");
+                //判断是否为盘螺materialName.contains("盘螺")||materialName.contains("盘元")
+                if (isPoundSale !=null && isPoundSale.compareTo(BigDecimal.valueOf(0))==0){
                     //根据运输订单号查找实绩重量
                     List<Map<String, Object>> netWeightlist = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
                     for (Map<String, Object> stringObjectMap : netWeightlist) {
@@ -83,6 +86,7 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
             }
             map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
         }
+
         return map;
     }
 }

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

@@ -1082,13 +1082,15 @@
 
     <select id="getDeliveryOrderMaterial" parameterType="java.lang.String" resultType="java.util.LinkedHashMap">
         select
+        distinct
             rm.material_name "materialName",
             rm.material_specification "materialSpe",
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
             oom.order_material_weight "materialWeight",
             tlr.RESULT_LOAD_START_TIME "makeDate",
-            oom.MATERIAL_ID "materialid"
+            oom.MATERIAL_ID "materialid",
+            asm.is_pound_sale   "isPoundSale"
         from omstruck_order oo
                  left join
              omstruck_order_material oom
@@ -1115,6 +1117,21 @@
             on
                   tlr.RESULT_TOTAL_ID =   ttr.RESULT_TOTAL_ID
             and tlr.MATERIAL_ID = oom.MATERIAL_ID
+            left join
+             rms_capacity rc
+             on
+                 rc.capacity_id = oo.capacity_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
+                 ams_sale_material asm
+            on asm.sale_order_id = aso.sale_order_id
         where oo.order_number = #{orderNumber}
     </select>
     <!--零星物资出厂实绩列表 -->