”修改采购内转还有内转零星“

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

@@ -180,12 +180,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<>();
         }
@@ -203,23 +198,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/resources/com/steerinfo/dil/mapper/AmstruckSporadicMaterialMapper.xml

@@ -475,7 +475,7 @@
   OOM.ORDER_ID = OO.ORDER_ID
   LEFT JOIN RMS_MATERIAL RM
   ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-  WHERE OO.ORDER_TYPE in (12,13,20)
+  WHERE OO.ORDER_TYPE in (12,13)
   AND ASO.ISSUE_STATUS = #{issueStatus}
   AND ASO.DELETED = 0
   AND ASO.TRANS_STATUS=1

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

@@ -542,7 +542,7 @@
         OOM.ORDER_ID = OO.ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-        WHERE OO.ORDER_TYPE in (12,13,20)
+        WHERE OO.ORDER_TYPE in (12,13)
         AND ASO.ISSUE_STATUS = #{issueStatus}
         AND ASO.DELETED = 0
         and   ASO.TRANS_STATUS =1