Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/controller/MtFactoryDataController.java

@@ -93,7 +93,7 @@ public class MtFactoryDataController extends BladeController {
 				if (!Objects.isNull(mainId)) {
 					asyncDataService.handlerMtDataToHt(map.get("mainId"));
 					// 走新系统暂存单
-					asyncDataService.handlerMtDataToHtNew(map.get("mainId"));
+//					asyncDataService.handlerMtDataToHtNew(map.get("mainId"));
 				}
 			} else {
 				orderStatusLog.setStatus(2);

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/controller/PanFactoryDataController.java

@@ -126,7 +126,7 @@ public class PanFactoryDataController extends BladeController {
 		if(!Objects.isNull(orderId)){
 			syncDataService.handlerPanDataToHt(orderId);
 			// 走新系统暂存单
-			syncDataService.handlerPanDataToHtNew(orderId);
+//			syncDataService.handlerPanDataToHtNew(orderId);
 		}