From e955eb6077fc28f0ad379af45c5adec1962eeff6 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期三, 29 四月 2026 17:56:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index eb3a3a7..2fe035d 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -18,6 +18,8 @@
import com.zy.common.constant.MesConstant;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +50,8 @@
private WrkMastService wrkMastService;
@Autowired
private WorkService workService;
+ @Autowired
+ private ConfigService configService;
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
@@ -156,10 +160,12 @@
throw new CoolException("鏈寚瀹氬洖搴撶被鍨嬶紒锛�");
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",mast.getLocNo()));
- if((mast.getCrnNo() != locMast.getCrnNo()) && mast.getIsSuplus()!=0){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�/绌烘澘鐩存帴鍥炴湰宸烽亾
- return workService.backLocOperationV2(mast.getWrkNo() + "", mast.getAppeUser());
+ Config config = configService.selectConfigByCode("BackLocV2");
+ if (!Cools.isEmpty(config) && config.getValue().equals("true")) {
+ if((mast.getCrnNo() != locMast.getCrnNo()) && mast.getIsSuplus()!=0){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�/绌烘澘鐩存帴鍥炴湰宸烽亾
+ return workService.backLocOperationV2(mast.getWrkNo() + "", mast.getAppeUser());
+ }
}
-
return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
}
--
Gitblit v1.9.1