modify_代码还原

common/src/main/java/com/behosoft/lis/wms/shelves/service/ShelvesTaskService.java

@@ -2241,7 +2241,7 @@ public class ShelvesTaskService extends ManagementService {
 		String sql = "select * from wms_shelves_task wst where wst.PICK_INBOUND_ID in " +
 				"(select opi.PICK_INBOUND_ID from oms_pick_inbound opi where opi.ACCOUNT_ID=:accountId " +
 				"and opi.CUSTOMER_ID=:customerId and opi.PICK_INBOUND_STATUS in (:pickInboundStatusList) and opi.IS_FEEDBACK=0 and opi.delete_flag=0 and opi.ACTUAL_RECEIVE_QUANTITY < 15000) " +
-				"and wst.SHELVES_STATUS in (:shelvesStatusList) and wst.delete_flag=0 limit 1";
+				"and wst.SHELVES_STATUS in (:shelvesStatusList) and wst.delete_flag=0";
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("accountId", accountId);
 		params.put("customerId", customerId);

web-clis/src/main/resources/config/lis/applicationContext.xml

@@ -35,9 +35,9 @@
 
 	<task:scheduled-tasks>
 		<!--百胜采购入库反馈-->
-		<task:scheduled ref="BsOmsPickInboundFeedbackSubscriberBean" method="receive" cron="0 0/10 1-23 * * ?" />
+		<task:scheduled ref="BsOmsPickInboundFeedbackSubscriberBean" method="receive" cron="0 0/10 1-10 * * ?" />
 		<!--百胜 销售出库反馈-->
-		<task:scheduled ref="BsOmsDeliveryOutboundFeedbackSubscriberBean" method="receive" cron="0 0/5 1-23 * * ?" />
+		<task:scheduled ref="BsOmsDeliveryOutboundFeedbackSubscriberBean" method="receive" cron="0 0/5 12-23 * * ?" />
 		<!--百胜快递状态反馈-->
 		<task:scheduled ref="BsCarriertrackingStatusFeedbackSubscriberBean" method="receive" cron="0 0/10 12-23 * * ?" />
 		<task:scheduled ref="DailyCleanLocationContainerSubscriberBean" method="receive" cron="0 0 2 * * ?" />