瀏覽代碼

新增需求备注

liyg 2 年之前
父節點
當前提交
8ee3fb55ea

+ 6 - 0
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -2177,6 +2177,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             mesMap.put("materialMesList",materialMesNew);
             mesMap.put("materialMesList",materialMesNew);
         } else {
         } else {
             mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId, steelJudge));
             mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId, steelJudge));
+        }
+        try{
+            //尝试查询内转需求备注
+            mesMap.put("insertUpdateRemark", omstruckOrderMapper.getInwardOrderMap(orderId).get("insertUpdateRemark"));
+        }catch (Exception e){
+
         }
         }
         return mesMap;
         return mesMap;
     }
     }

+ 2 - 1
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -3029,7 +3029,8 @@
         SELECT AIR.REQUIREMENT_NUMBER AS "upNumber",
         SELECT AIR.REQUIREMENT_NUMBER AS "upNumber",
                OO.ORDER_NUMBER        AS "orderNumber",
                OO.ORDER_NUMBER        AS "orderNumber",
                RC.CAPACITY_NUMBER     AS "capacityNumber",
                RC.CAPACITY_NUMBER     AS "capacityNumber",
-               RCA.CARRIER_NAME       AS "carrierName"
+               RCA.CARRIER_NAME       AS "carrierName",
+               AIR.INSERT_UPDATE_REMARK "insertUpdateRemark"
         FROM OMSTRUCK_ORDER OO
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID