From 2ede5469ff64257e97ab92825261afeb643d7b82 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期四, 28 八月 2025 15:56:05 +0800 Subject: [PATCH] #订单出库agv库位锁定,取消,配置 --- src/main/java/com/zy/common/web/WcsController.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java index 2d251c6..9b03a77 100644 --- a/src/main/java/com/zy/common/web/WcsController.java +++ b/src/main/java/com/zy/common/web/WcsController.java @@ -162,12 +162,14 @@ // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true); WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode()); + if(sourceStaNo ==null ){ + return R.error("璇ョ珯鐐圭洏鐐圭Щ鏍借鍙紝璇锋煡鐪嬫簮绔欑偣鐘舵�佹娴�"); + } if(wrkMast1== null){ return R.error("鏃犺鐩樼偣绉绘牻浠诲姟"); } List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo()); Date now = new Date(); - // 鐢熸垚宸ヤ綔妗� WrkMast wrkMast = new WrkMast(); wrkMast.setWrkNo(9997); @@ -208,6 +210,9 @@ // 婧愮珯鐐圭姸鎬佹娴� BasDevp sourceStaNo = basDevpService.checkSiteStatus(transplantWork.getStaNo(), true); WrkMast wrkMast1 = wrkMastService.selectWrkMast(transplantWork.getWorkNo(),transplantWork.getBarcode()); + if(sourceStaNo == null){ + + } if(wrkMast1== null){ return R.error("鏃犺鐩樼偣绉绘牻浠诲姟"); } -- Gitblit v1.9.1