xiugi

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

@@ -108,7 +108,7 @@ public class UtilsServiceImpl implements IUtilsService {
             return 0;
         }
         //如果订单里面路段顺序号 大于 实绩里面路段顺序号,则不更新
-        if (orderLineSequence.intValue() > segmentSqe.intValue()) {
+        if (orderLineSequence != null && segmentSqe != null && orderLineSequence.intValue() > segmentSqe.intValue()) {
             segmentSqe = orderLineSequence;
         }
         Map<String, Object> mesMap = new HashMap<>();

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

@@ -3129,6 +3129,7 @@
         ASM.SALE_MATERIAL_ID "saleMaterialId",
         ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
         ASM.MATERIAL_NUMBER "materialNumber",
+        ASM.MATERIAL_NUMBER "materialNum",
         ASM.IS_POUND_SALE   "isPoundSale",
         ADSO.CARRIER_ID     "carrierId",
         ASM.EAS_PRIMARY_ID "closeEntryId",