Merge branch 'pre-production'

blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java

@@ -43,7 +43,7 @@ public class DealWithDataHandler {
 		String status = orderStatusDTO.getStatus();
 		String unitNo = orderStatusDTO.getUnitNo();
 		String operationTime = orderStatusDTO.getOperationTime();
-		if ("4".equals(status)||"到货".equals(status)) {
+		if ("4".equals(status)) {
 			//继续判断是否到达目的仓
 			String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
 			//查询destinationWarehouse logiBillNo plantId数据

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml

@@ -11,8 +11,7 @@
         `ht_order_count` `i`
         INNER JOIN `ht_order` `order` ON `order`.`selfnumber` = `i`.`orderSelfNum`
         WHERE
-        `i`.`history_type` = 0
+        `i`.`status` <> 11
-        AND `i`.`status` <> 11
         AND `i`.`delete_time` = '0'
         AND ( ( `i`.`in_num` + `i`.`delives_num` ) > 0 )
         AND `i`.`goods_type` = '1'

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1061,7 +1061,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 			if(!b){
 				log.error("################saveTrayTypeInfo: 包件打托失败 unitNo={} trayCode={}",unitNo,"T"+trayId);
-				throw new CustomerException(403,"包件打托失败");
+//				throw new CustomerException(403,"包件打托失败");
 			}
 		}
 	}