luobang 2 年之前
父節點
當前提交
f6f45889dc

+ 7 - 0
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -680,6 +680,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
             //根据车序号ID去查询车牌号、承运商以及分录ID
             List<Map<String,Object>> head = omstruckOrderMapper.finCarAndCarrierAndEntries(saleOrderMaterialId);
+            for (Map<String,Object> headMap : head) {
+                if(map.get("capacityNo") != null && !"空白".equals(map.get("capacityNo"))) {
+                    headMap.put("carNum",map.get("capacityNo"));
+                }else if(map.get("capacityNo") != null && "空白".equals(map.get("capacityNo"))){
+                    headMap.put("carNum"," ");
+                }
+            }
             entries.addAll(head);
         }
         Map<String,Object> input = new HashMap<>();

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

@@ -940,7 +940,7 @@
                  LEFT JOIN AMS_SALE_ORDER ASO
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
-          AND OO.ORDER_TYPE = 1
+          and aso.SALE_TYPE = 1
           and ASM.SALE_MATERIAL_ID IS NOT NULL
     </select>
     <select id="selectOrderMes" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">