Your Name 3 gadi atpakaļ
vecāks
revīzija
3743ab3092

+ 1 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -303,6 +303,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                     measureCommission.put("orderSource", measureCommission.get("chooseOrderSource"));
                     measureCommission.put("billType", "0");
                     measureCommission.put("item", measureCommission.get("item") + ",1");
+                    measureCommission.put("goodsName",measureCommission.get("goodsName") + "null");
                 }else {
                     measureCommission.put("orderSource", "0");
                     measureCommission.put("billType", "2");

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

@@ -802,7 +802,7 @@
                    )                                                                          "receiverNo",
                RM.MATERIAL_ID || ''                                                                "item",
                RM.MATERIAL_CODE                                                               "goodsNo",
-               CONCAT(RM.MATERIAL_NAME, CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "goodsName",
+               CONCAT(RM.MATERIAL_NAME, CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL),'null') "goodsName",
                (case
                    when OOM.ORDER_MATERIAL_WEIGHT  is null
                     then 0