From 50a862870d6945c8b69adfb283826b84abeb236b Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期三, 03 四月 2024 16:56:47 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java index 4f7ef93..357d9c6 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java @@ -703,11 +703,11 @@ } -// /** -// * 鐢熸垚鍏呯數鍔ㄤ綔 -// */ -// public List<Motion> generateChargeMotion(WrkCharge wrkCharge) { -// List<Motion> motionList = new ArrayList<>(); + /** + * 鐢熸垚鍏呯數鍔ㄤ綔 + */ + public List<Motion> generateChargeMotion(Task task) { + List<Motion> motionList = new ArrayList<>(); // if (wrkCharge.getWrkSts() != WrkMastStsType.NEW_CHARGE.sts || wrkCharge.getIoType() != WrkIoTypeType.CHARGE.sts) { // return motionList; // } @@ -866,15 +866,15 @@ // dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue()); // })) // )); -// -// return motionList; -// } -// -// /** -// * 鐢熸垚鍏呯數瀹屾垚鍔ㄤ綔 -// */ -// public List<Motion> generateShuttleChargeWrkComplete(WrkCharge wrkCharge) { -// List<Motion> motionList = new ArrayList<>(); + + return motionList; + } + + /** + * 鐢熸垚鍏呯數瀹屾垚鍔ㄤ綔 + */ + public List<Motion> generateShuttleChargeWrkComplete(Task task) { + List<Motion> motionList = new ArrayList<>(); // if (wrkCharge.getWrkSts() != WrkMastStsType.NEW_MOVE.sts || wrkCharge.getIoType() != WrkIoTypeType.MOVE.sts) { // return motionList; // } @@ -909,8 +909,8 @@ // )); // // } -// return motionList; -// } + return motionList; + } -- Gitblit v1.9.1