tijiao

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

@@ -183,8 +183,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         if(i == 0){
             return i;
         }
-
-
         tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //更新路段顺序号
         utilsService.updateOrderLineSequence(steelMesMap); //orderId segmentSqe

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

@@ -1872,8 +1872,8 @@
                     ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
                     RSR.SALER_NAME "saler",
                     RM.MATERIAL_ID  "materialId",
-                    RM.MATERIAL_NAME || RM.MATERIAL_MODEL "materialName",
-                    RM.MATERIAL_SPECIFICATION "materialSpe",
+                    RM.MATERIAL_NAME  "materialName",
+                    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
                     R_CARRIER.CARRIER_ABBREVIATION "carrierName",
                     OO.ORDER_NUMBER "orderNo",
                     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
@@ -1899,10 +1899,10 @@
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
                     R_CARRIER.CARRIER_ID        "carrierId",
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
-                    DECODE(ASO.SALE_ORDER_STATUS,0,'销售订单未上报',
-                                                 1,'销售订单已上报',
+                    DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                                  2,'销售已提交',
-                                                 4,'财务已审批') "saleOrderStatus",
+                                                 4,'财务已审批',
+                                                 0,'销售订单未上报') "saleOrderStatus",
                     DECODE(OO.ORDER_STATUS || NVL(OO.ORDER_LINE_SEQUENCE, 0),
                                                                  40,
                                                                     '运单未接收',