From f6796dda5fb7e269482f0cc92a898fe7ffc203d4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 三月 2024 12:56:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 710ea2e..392ad72 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -12,9 +12,11 @@
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
@@ -39,6 +41,8 @@
private Integer equipmentCount;
@Value("${channel.channelMax}")
private Integer channelMax;
+ @Autowired
+ private WrkMastService wrkMastService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -105,6 +109,18 @@
@RequestMapping(value = "/locMast/update/auth")
@ManagerAuth(memo = "搴撲綅淇敼")
public R update(LocMast locMast){
+ LocMast locMast1 = locMastService.selectById(locMast.getLocNo());
+ if (locMast.getLocType1()==0){
+ locMast.setLocType1(locMast1.getLocType1());
+ }
+ if (!locMast1.getLocType1().equals(locMast.getLocType1())){
+ if (locMast.getRow1()!=2){
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛屽彧鍏佽绗簩鎺掑簱浣嶄慨鏀瑰簱浣嶇被鍨嬶紒锛侊紒");
+ }
+ if (locMast1.getLocType1()==1){
+ return R.error("褰撳墠鎿嶄綔宸茶闃绘锛屾祴璇曞簱浣嶇姝慨鏀瑰簱浣嶇被鍨嬶紒锛侊紒");
+ }
+ }
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
@@ -118,6 +134,11 @@
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
}
+ if(locMast.getFreeze()==1&&locMast.getPackStatus()==6){
+ locMast.setPackStatus(5);
+ locMast.setLocSts("F");
+ wrkMastService.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+ }
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
--
Gitblit v1.9.1