tijia

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

@@ -456,7 +456,7 @@ public class WmspGridMaterialServiceImpl  implements IWmspGridMaterialService {
                 WmspInboundResult wmspInboundResult = new WmspInboundResult();
                 wmspInboundResult.setInboundId(inboundId);
                 wmspInboundResult.setInboundIscomplete(new BigDecimal(2));
-                wmspInboundResult.setInboundOnlyValue(inboundEasId);
+                //wmspInboundResult.setInboundOnlyValue(inboundEasId);
                 wmspInboundResult.setIsupload(new BigDecimal(1));
 //            修改入库实绩
                 count += wmspInboundResultMapper.updateByPrimaryKeySelective(wmspInboundResult);

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

@@ -795,7 +795,7 @@
       AND RM.MATERIAL_CODE = #{materialCode}
       AND RM.MATERIAL_MODEL= #{materialModel}
       AND RM.MATERIAL_SPECIFICATION = #{materialSpecification}
-    ORDER BY RMS.INSERT_TIME DESC
+    ORDER BY RMS.INSERT_TIME desc
   </select>
     <select id="getGridMaterialAgeList" resultType="java.util.Map">
       SELECT