Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -53,10 +53,10 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     List<Map<String,Object>> getDeliveryOrderMaterial(String orderNumber);
 
     //根据运输订单号查找过磅重量
-    Map<String,Object> getNetWeightByOrder(Map<String,Object> map);
+    List<Map<String,Object>> getNetWeightByOrder(Map<String,Object> map);
 
     //根据运输订单查找物资理重
-    String getTheoryWeight(Map<String,Object> map);
+    List<Map<String, Object>> getTheoryWeight(Map<String,Object> map);
 
 
 
@@ -81,4 +81,12 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     BigDecimal getSaleOrderId(String orderNumber);
 
     Integer getOrderStatus(BigDecimal orderId);
+
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:
+     * @Description:查询出备注
+    */
+    String querynote(String orderNumber);
 }

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.service.ITmstruckSelfMachineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -43,26 +44,41 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
     public Map<String, Object> getDeliveryOrder(String orderNumber) {
         //1.根据运输订单号查询主干信息
         Map<String,Object> map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
+        map.put("note",tmstruckLeaveFactoryResultMapper.querynote(orderNumber));
         map.put("orderNumber",orderNumber);
         if(map !=null){
             List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
             //判断为棒材还是线材
             for (Map<String,Object> map1:deliveryOrderMaterialList){
-                map1.remove("materialWeight");
+                BigDecimal materialid = (BigDecimal) map1.get("materialid");
                 String materialName =(String) map1.get("materialName");
                 map.put("materialName",materialName);
                 //判断是否为盘螺
-                if (materialName.contains("盘螺")){
+                if (materialName.contains("盘螺")||materialName.contains("螺纹钢")||materialName.contains("盘元")){
                     //根据运输订单号查找实绩重量
-                    Map<String, Object> netWeight = tmstruckLeaveFactoryResultMapper.getNetWeightByOrder(map);
-                    String nowNetWeight =(String) netWeight.get("nowNetWeight");
-                    if (nowNetWeight!=null) {
-                        map.put("materialWeight", nowNetWeight);
+                    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);
+                            }
+                        }
                     }
                 }else {
                     //获取物资理重
-                    String theoryWeight = tmstruckLeaveFactoryResultMapper.getTheoryWeight(map);
-                    map.put("materialWeight",theoryWeight);
+                    List<Map<String, Object>> theoryWeightlist = tmstruckLeaveFactoryResultMapper.getTheoryWeight(map);
+                    for (Map<String, Object> stringObjectMap : theoryWeightlist) {
+                        BigDecimal materialid1 = (BigDecimal) stringObjectMap.get("materialid");
+                        if (materialid.compareTo(materialid1) == 0){
+                            BigDecimal theoryWeight=(BigDecimal) stringObjectMap.get("theoryWeight");
+                            if (theoryWeight != null){
+                                map1.put("materialWeight",theoryWeight);
+                            }
+                        }
+                    }
+
                 }
             }
             map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);

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

@@ -1087,7 +1087,8 @@
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
             oom.order_material_weight "materialWeight",
-            tlr.RESULT_LOAD_START_TIME "makeDate"
+            tlr.RESULT_LOAD_START_TIME "makeDate",
+            oom.MATERIAL_ID "materialid"
         from omstruck_order oo
                  left join
              omstruck_order_material oom
@@ -1302,7 +1303,8 @@
 
    <!-- 获取物资实重-->
     <select id="getNetWeightByOrder" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight"
+        SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight",
+        TWR.MATERIAL_ID AS "materialid"
         FROM OMSTRUCK_ORDER OO
         left join OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID=OO.ORDER_ID
@@ -1315,8 +1317,9 @@
         WHERE OO.ORDER_NUMBER = #{orderNumber} and RM.MATERIAL_NAME=#{materialName}
     </select>
 <!--    获取物资理重-->
-    <select id="getTheoryWeight" resultType="java.lang.String" parameterType="java.util.Map">
-        select ASTM.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight"
+    <select id="getTheoryWeight" resultType="java.util.Map" parameterType="java.util.Map">
+        select ASTM.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+        ASM.MATERIAL_ID "materialid"
        from OMSTRUCK_ORDER oo
        left join AMS_SALE_ORDER_MATERIAL ASOM
        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -1330,4 +1333,12 @@
         ON RM.MATERIAL_ID=ASM.MATERIAL_ID
        where  oo.ORDER_NUMBER=#{orderNumber}  and RM.MATERIAL_NAME=#{materialName}
     </select>
+
+    <select id="querynote" resultType="java.lang.String">
+        select aso.sale_remark
+          from omstruck_order oo
+          left join AMS_SALE_ORDER aso
+          on aso.SALE_ORDER_ID=oo.order_plan_id
+         where oo.order_number = #{orderNumber}
+    </select>
 </mapper>