粮情卡归档功能优化

src/main/java/com/chinaitop/depot/basic/mapper/BasicWarehouseMapper.xml

@@ -722,5 +722,8 @@
     <if test="orgId != null">
       and org_id=#{orgId}
     </if>
+    <if test="zhywsj != null">
+      and #{zhywsj} > check_time
+    </if>
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/unissoft/webservice/BasicWarehouseWebServiceImpl.java

@@ -78,6 +78,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 							param.put("houseId", Integer.parseInt(basicTank.getId()));
 							param.put("orgId", Integer.parseInt(obj.getOrgId()));
 							param.put("status", obj.getStatus());
+							param.put("zhywsj", obj.getCjsj());//最后业务时间
 							if (null != basicTank && YwConstant.FC_STATUS.equals(basicTank.getCrkStatus())) {
 								/**
 								 * 查询封仓时间，看业务时间是不是在分仓时间之后。
@@ -113,6 +114,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 								param.put("wareId", Integer.parseInt(obj.getWareId()));
 								param.put("orgId", Integer.parseInt(obj.getOrgId()));
 								param.put("status", obj.getStatus());
+								param.put("zhywsj", obj.getCjsj());//最后业务时间
 								if ("3".equals(warehouse.getCrkStatus())) {
 									//查询封仓时间
 									List<Map<String, Object>> lqk_map = warehouseMapper.queryFenCangCfData(param);
@@ -174,6 +176,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 			Map<String, Object> lqkmap = new HashMap<String, Object>();
 			lqkmap.put("wareId", param.get("wareId"));
 			lqkmap.put("orgId", param.get("orgId"));
+			lqkmap.put("zhywsj", param.get("zhywsj"));
 			int count = warehouseMapper.updateYlLqkGd(lqkmap);//归档原粮粮情卡
 			if (count > 0) {//有粮情卡被归档了，质检在归档，没有就不归档了
 				warehouseMapper.updateQualitycheck(lqkmap);//归档自检数据
@@ -207,6 +210,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 			Map<String, Object> lqkmap = new HashMap<String, Object>();
 			lqkmap.put("storehouseId", wareId);
 			lqkmap.put("orgId", param.get("orgId"));
+			lqkmap.put("zhywsj", param.get("zhywsj"));
 			int count = warehouseMapper.updateYlLqkGd(lqkmap);//归档原粮粮情卡
 			if (count > 0) {
 				warehouseMapper.updateQualitycheck(lqkmap);//归档自检数据