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

src/main/java/com/steerinfo/dil/controller/AmstruckInwardRequirementController.java

@@ -159,12 +159,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  String carrierSsoId,
                                                  String enableStatus,
                                                  String planStatus) {
-        if (con != null) {
-            if (!con.equals("undefined")) {
-                String index="get_pur_requirement_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -182,23 +177,8 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         }
         mapValue.put("requirementStatus",requirementStatus);
         List<Map<String, Object>> truckRequirementList = null;
-        if (mapValue.size() == 1) {
-            //将查询结果存入索引中
-            truckRequirementList =  amstruckInwardRequirementService.getPurRequirementList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_pur_requirement_list");
-            //添加id
-            map1.put("indexId","purRequirementId");
-            truckRequirementList.add(map1);
-            //新建索引
-            esFeign.insertIndex(truckRequirementList);
-            //删除
-            truckRequirementList.remove(truckRequirementList.size()-1);
-        }
-        if (truckRequirementList == null) {
-            truckRequirementList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
-        }
+        //将查询结果存入索引中
+        truckRequirementList =  amstruckInwardRequirementService.getPurRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurRequirementList(mapValue);

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

@@ -249,6 +249,7 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
             case 13:
             case 15:
             case 16:
+            case 20:
                 addSporadicOrdersForCoke(map);
 
         }
@@ -338,6 +339,9 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
                     if (type.intValue() == 13) {
                         orderType += "内转零星出厂";
                     }
+                    if (type.intValue() == 20) {
+                        orderType += "内转零星(新区-老区)进厂";
+                    }
                     if (tranStatus.intValue() == 0){
                         Status += "禁用";
                     }