提交送货单的代码

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

@@ -89,4 +89,12 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
      * @Description:查询出备注
     */
     String querynote(String orderNumber);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date: 2022-08-30
+     * @Description:根据物资ID和订单编号查询物资件数
+    */
+    BigDecimal queryNumber(BigDecimal materialid,String orderNumber);
 }

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

@@ -55,9 +55,11 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
             List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
             //判断为棒材还是线材
             for (Map<String,Object> map1:deliveryOrderMaterialList){
-                BigDecimal materialid = (BigDecimal) map1.get("materialid");
+                BigDecimal materialid = (BigDecimal) map1.get("materialId");
                 String materialName =(String) map1.get("materialName");
                 map.put("materialName",materialName);
+                BigDecimal Bigdecimal1 = tmstruckLeaveFactoryResultMapper.queryNumber(materialid, orderNumber);
+                map1.put("materialNumber",Bigdecimal1);
                 //判断是实重还是理重的标志
                 BigDecimal isPoundSale = (BigDecimal) map1.get("isPoundSale");
                 //判断是否为盘螺materialName.contains("盘螺")||materialName.contains("盘元")
@@ -66,11 +68,15 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
                     List<Map<String, Object>> netWeightlist = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
                     for (Map<String, Object> stringObjectMap : netWeightlist) {
                         BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
-                        if (materialid.compareTo(materialid1) == 0) {
-                            BigDecimal nowNetWeight = (BigDecimal) stringObjectMap.get("nowNetWeight");
-                            if (nowNetWeight != null) {
-                                map1.put("materialWeight", nowNetWeight);
+                        if(materialid1 !=null&&!("".equals(materialid1))){
+                            if (materialid.compareTo(materialid1) == 0) {
+                                BigDecimal nowNetWeight = (BigDecimal) stringObjectMap.get("nowNetWeight");
+                                if (nowNetWeight != null) {
+                                    map1.put("materialWeight", nowNetWeight);
+                                }
                             }
+                        }else {
+                            map1.put("materialWeight", "");
                         }
                     }
                 }else {
@@ -79,13 +85,12 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
                     for (Map<String, Object> stringObjectMap : theoryWeightlist) {
                         BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
                         if (materialid.compareTo(materialid1) == 0){
-                            BigDecimal theoryWeight=(BigDecimal) stringObjectMap.get("theoryWeight");
+                            BigDecimal theoryWeight=(BigDecimal) stringObjectMap.get("theoreticalWeight");
                             if (theoryWeight != null){
                                 map1.put("materialWeight",theoryWeight);
                             }
                         }
                     }
-
                 }
             }
             map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);

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

@@ -1081,54 +1081,20 @@
     </select>
 
     <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",
-            asm.is_pound_sale   "isPoundSale"
-        from omstruck_order oo
-                 left join
-             omstruck_order_material oom
-             on
-                 oom.order_id = oo.order_id
-                 left join
-             rms_material rm
-             on
-                 rm.material_id = oom.MATERIAL_ID
-                 left join
-             rms_unit_of_measure ruom
-             on
-                 ruom.unit_of_measure_id = rm.unit_of_measure_id
-            left join
-            TMSTRUCK_TOTAL_RESULT ttr
-            on ttr.ORDER_ID = oo.ORDER_ID
-                left  join
-            TMSTRUCK_WEIGHT_RESULT twr
-            on
-                 twr.RESULT_TOTAL_ID =   ttr.RESULT_TOTAL_ID
-            and twr.MATERIAL_ID = oom.MATERIAL_ID
-                left  join
-            TMSTRUCK_LOAD_RESULT tlr
-            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_TRUCKNO_MATERIAL astm
-             on astm.sale_order_material_id = asom.sale_order_material_id
-             left join AMS_SALE_MATERIAL asm
-             on asm.sale_material_id = astm.material_id
+        SELECT DISTINCT
+        rm.material_name "materialName",
+        rm.material_specification "materialSpe",
+        rm.material_model "materialModel",
+        rm.material_id "materialId",
+        asm.is_pound_sale "isPoundSale"
+        FROM
+        omstruck_order oo
+        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_TRUCKNO_MATERIAL astm ON astm.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 rms_material rm ON rm.material_id = ASM.MATERIAL_ID
+        LEFT JOIN rms_unit_of_measure ruom ON ruom.unit_of_measure_id = rm.unit_of_measure_id
         where oo.order_number = #{orderNumber}
     </select>
     <!--零星物资出厂实绩列表 -->
@@ -1329,11 +1295,13 @@
         ON OO.ORDER_ID = TTR.ORDER_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber} and RM.MATERIAL_NAME=#{materialName}
+        AND TWR.RESULT_NET_WEIGHT IS NOT NULL
     </select>
 <!--    获取物资理重-->
     <select id="getTheoryWeight" resultType="java.util.Map" parameterType="java.util.Map">
-        select ASTM.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+        select ASM.MATERIAL_WEIGHT "theoreticalWeight",
         ASM.MATERIAL_ID "materialid"
        from OMSTRUCK_ORDER oo
        left join AMS_SALE_ORDER_MATERIAL ASOM
@@ -1358,4 +1326,12 @@
           on aso.SALE_ORDER_ID =  asom.sale_order_id
          where oo.order_number = #{orderNumber}
     </select>
+    <select id="queryNumber" resultType="java.math.BigDecimal">
+        select oom.order_material_number  "materialNumber"
+        from omstruck_order oo
+        left join omstruck_order_material oom
+        on oom.order_id = oo.order_id
+        where oom.Material_Id=#{materialid}
+        and oo.order_number=#{orderNumber}
+    </select>
 </mapper>