sdhas

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

@@ -359,10 +359,9 @@ public class WmspGridMaterialController extends BaseRESTfulController {
 //        进行对钢材物资名称的模糊查询
         String cons = "%"+con+"%";
         mapValue.put("con",cons);
-        List<Map<String,Object>> columnList=wmspGridMaterialService.getSteelMaterialModelList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String,Object>> mapList=wmspGridMaterialService.getSteelMaterialModelList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,columnList,mapList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null,mapList);
         return success(pageList);
     }
 

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

@@ -457,10 +457,6 @@
   
                  WHERE RPG.WAREHOUSE_ID =#{warehouseId}
                  AND WIR.INBOUND_ISCOMPLETE=#{status}
-                <if test="startDate != null">
-                  AND to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= WIR.INBOUND_TIME
-                  AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIR.INBOUND_TIME
-                </if>
                 GROUP BY RM.MATERIAL_CODE
         ) table1
        ON table1.code = RM.MATERIAL_CODE
@@ -469,10 +465,6 @@
         AND RM.MATERIAL_NAME LIKE (#{con})
         AND table1.count>0
       </if>
-      <if test="startDate != null">
-        AND to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= WIR.INBOUND_TIME
-        AND to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= WIR.INBOUND_TIME
-      </if>
       AND WIR.INBOUND_ISCOMPLETE=#{status}
       <include refid="orderBy"></include>
     </select>

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

@@ -789,14 +789,12 @@
     LEFT JOIN WMSP_INBOUND_RESULT WIR
     ON WIR.MATERIAL_ID = WGM.MATERIAL_ID
     WHERE WIR.RESULT_DELETED =0
-      AND WGM.DELETED = 0
       AND WIR.INBOUND_ISCOMPLETE =#{status}
       AND WIR.RESULT_STATUS >1
       AND RPG.WAREHOUSE_ID = #{warehouseId}
       AND RM.MATERIAL_CODE = #{materialCode}
       AND RM.MATERIAL_MODEL= #{materialModel}
       AND RM.MATERIAL_SPECIFICATION = #{materialSpecification}
-       AND WIR.INSERT_TIME >= trunc(sysdate)
     ORDER BY RMS.INSERT_TIME DESC
   </select>
     <select id="getGridMaterialAgeList" resultType="java.util.Map">