Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -307,6 +307,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
         // 销售订单主键
         BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
+        // 车序号计数
+        int count = 1;
         // 遍历每一个列
         for (Map<String, Object> map : mapList) {
             // 销售订单-物资中间表id
@@ -338,8 +340,6 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             if (!"null".equals(dateOfReceiptStr) && !"undefined".equals(dateOfReceiptStr)) {
                 dateOfReceipt = new Date(Long.valueOf(dateOfReceiptStr));
             }
-            // 车序号计数
-            int count = 1;
             /*
              车序号表
              */
@@ -413,7 +413,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             omstruckOrder.setOrderIssueTime(new Date());
             // 运单状态
             omstruckOrder.setOrderStatus(new BigDecimal(4));
-            // 订单类型
+            // 订单类型(非钢材销售)
             omstruckOrder.setOrderType(new BigDecimal(2));
             // 运输线路id
             omstruckOrder.setLineId(lineId);

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

@@ -412,12 +412,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         String statusStr;
         for (Map<String, Object> resultMap : resultList) {
             BigDecimal saleOrderStatus = (BigDecimal) resultMap.get("saleOrderStatus");
-            if (saleOrderStatus.intValue() == 2) {
-                statusStr = "销售公司已审核";
-            }
-            else {
-                statusStr = "财务已审核";
-            }
+//            if (saleOrderStatus.intValue() == 2) {
+//                statusStr = "销售公司已审核";
+//            }
+//            else {
+//                statusStr = "财务已审核";
+//            }
+            statusStr = saleOrderStatus.intValue() == 2 ? "销售公司已审批" : "财务已审批";
             resultMap.put("statusStr",statusStr);
         }
         return resultList;