From 343c481942557912e81662fc71d73cb45ccde17d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 10 九月 2025 11:07:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 02f7233..c733f13 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,13 +10,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
-import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.entity.Parameter;
-import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,8 +25,6 @@
@Autowired
private LocMastService locMastService;
- @Autowired
- private LocDetlService locDetlService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -145,6 +140,18 @@
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
return R.error();
}
+ if (!Cools.isEmpty(locMast.getContainerCode())){
+ locMast.setBarcode(locMast.getContainerCode());
+ }
+
+ if (locMast.getEmptyContainer$().equals("N") ){
+ if (locMast.getContainerCode().isEmpty() || locMast.getContainerTypeCode().isEmpty()){
+ return R.error("瀹瑰櫒缂栫爜鎴栧鍣ㄧ被鍨嬫湁璇�");
+ }
+ }
+ if (locMast.getLocSts().equals("O")){
+ locMast.setBarcode(null);
+ }
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
@@ -190,7 +197,6 @@
}
}
locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
}
--
Gitblit v1.9.1