From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 197 +++++++++++++++++++++++-------------------------
1 files changed, 95 insertions(+), 102 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index df6f1bc..4c0fd91 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,9 +10,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWhs;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.BasWhsService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
@@ -32,19 +34,25 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private BasWhsService basWhsService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
if (Cools.isEmpty(pwd)) {
- return R.error("璇疯緭鍏ュ彛浠�");
+ return R.error("response.input_password");
}
- return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
+ R r = R.ok();
+ r.put("data",Parameter.get().getLocMastInitPwd().equals(pwd));
+ return r;
}
@PostMapping(value = "/group/empty/stock")
- @ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
+ @ManagerAuth(memo = "response.get_group_empty_stock")
public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
- return R.ok().add(locMastService.queryGroupEmptyStock(sourceLocNo));
+ R r = R.ok();
+ r.put("data", locMastService.queryGroupEmptyStock(sourceLocNo));
+ return r;
}
@RequestMapping(value = "/locMast/{id}/auth")
@@ -63,6 +71,7 @@
excludeTrash(param);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
+ wrapper.orderBy("modi_time",true);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -90,25 +99,25 @@
}
@RequestMapping(value = "/locMast/add/auth")
- @ManagerAuth(memo = "搴撲綅娣诲姞")
+ @ManagerAuth(memo = "response.loc_mast_add")
public R add(LocMast locMast) {
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMast.setAppeUser(getUserId());
locMast.setAppeTime(new Date());
locMastService.insert(locMast);
- return R.ok();
+ return R.ok("response.save_success");
}
@RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth(memo = "搴撲綅淇敼")
+ @ManagerAuth(memo = "response.loc_mast_update")
public R update(LocMast locMast){
if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
- return R.error();
+ return R.error("response.param_error");
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
- return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
+ return R.error("response.operation_blocked_contact_admin");
}
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
@@ -119,24 +128,24 @@
locMast.setModiUser(getUserId());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/locMast/delete/auth")
- @ManagerAuth(memo = "搴撲綅鍒犻櫎")
+ @ManagerAuth(memo = "response.loc_mast_delete")
public R delete(@RequestParam String param){
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("response.param_error");
}
for (LocMast entity : list){
locMastService.delete(new EntityWrapper<>(entity));
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/locMast/export/auth")
- @ManagerAuth(memo = "搴撲綅瀵煎嚭")
+ @ManagerAuth(memo = "response.loc_mast_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
@@ -167,104 +176,88 @@
public R query(@RequestBody JSONObject param) {
Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != locMastService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(LocMast.class, String.valueOf(param.get("key"))));
+ return r;
}
- return R.ok();
+ return R.ok("response.operation_success");
+ }
+
+ @PostMapping(value = "/locMast/batchUpdateArea/auth")
+ @ManagerAuth
+ public R batchUpdateArea(@RequestBody JSONObject param) {
+ List<String> locNos = param.getJSONArray("locNos").toJavaList(String.class);
+ Integer areaId = param.getInteger("areaId");
+ if (Cools.isEmpty(locNos) || areaId == null) {
+ return R.error("response.param_error");
+ }
+ locMastService.batchUpdateArea(locNos, areaId.shortValue());
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/locMast/init/auth")
- @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+ @ManagerAuth(memo = "response.loc_mast_init")
// @Transactional
public R init(LocMastInitParam param) {
- List<LocMast> list = new ArrayList<>();
- for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
- for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
- for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
- // 鑾峰彇搴撲綅鍙�
- String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
- // 鑾峰彇鍫嗗灈鏈哄彿
- int crnNo = 0;
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount());
- for (List<Integer> node : shelves.nodes){
- if (node.contains(r)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
- break;
+ try{
+ List<LocMast> list = new ArrayList<>();
+ BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
+ if (Cools.isEmpty(basWhs)){
+ return R.error("response.whs_type_not_exist");
+ }
+ for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
+ for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
+ for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ // 鑾峰彇搴撲綅鍙�
+ String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
+ // 鑾峰彇鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ try{
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
+ for (List<Integer> node : shelves.nodes){
+
+ if (node.contains(r)) {
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
+ }else {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
+ break;
+ }
+ }
+ }catch (Exception e){
+ throw new Exception("response.crn_parse_error");
}
+
+ Date now = new Date();
+ LocMast locMast = new LocMast();
+ locMast.setLocNo(locNo);
+ locMast.setLocSts("O");
+ locMast.setRow1(r); // 鎺�
+ locMast.setBay1(b); // 鍒�
+ locMast.setLev1(l); // 灞�
+ locMast.setGro1(r); // 缁�
+ locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
+ locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
+ locMast.setLocType2(param.getLocType2());
+ locMast.setLocType3(param.getLocType3());
+ locMast.setAppeUser(getUserId());
+ locMast.setAppeTime(now);
+ locMast.setModiUser(getUserId());
+ locMast.setModiTime(now);
+ locMast.setWhsType(basWhs.getId());
+ list.add(locMast);
}
- Date now = new Date();
- LocMast locMast = new LocMast();
- locMast.setLocNo(locNo);
- locMast.setLocSts("O");
- locMast.setRow1(r); // 鎺�
- locMast.setBay1(b); // 鍒�
- locMast.setLev1(l); // 灞�
- locMast.setCrnNo(crnNo); // 鍫嗗灈鏈�
- locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
- locMast.setLocType2(param.getLocType2());
- locMast.setLocType3(param.getLocType3());
- locMast.setAppeUser(getUserId());
- locMast.setAppeTime(now);
- locMast.setModiUser(getUserId());
- locMast.setModiTime(now);
- list.add(locMast);
}
}
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ locMastService.delete(new EntityWrapper<>());
+ }
+ locMastService.insertBatch(list);
+ return R.ok("response.init_success");
+ }catch (Exception e){
+ return R.error("response.init_failed");
}
- locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
- locMastService.insertBatch(list);
- return R.ok("鍒濆鍖栨垚鍔�");
- }
-
- @RequestMapping(value = "/locMast/convert/size/auth")
- @ManagerAuth(memo = "澶у皬搴撲綅杞崲")
- @Transactional
- public R convertSize(@RequestParam String param) {
- List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (LocMast entity : list){
- if (!entity.getCrnNo().equals(1) && !entity.getCrnNo().equals(4)){
- return R.error("璇烽�夋嫨1鍙枫��4鍙峰爢鍨涙満鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細"+entity.getLocNo());
- }
- if (!entity.getLocSts().equals("O") && !entity.getLocSts().equals("Y")){
- return R.error("璇烽�夋嫨绌洪棽銆佽鍚堝苟鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細"+entity.getLocNo());
- }
- }
- List<String> innermostSideLoc = Utils.getInnermostSideLoc(list);
- StringBuilder msg=new StringBuilder();
- for (String locNo : innermostSideLoc){
- String innermostSideLocLBR = Utils.getInnermostSideLocLBR(locNo);
- LocMast locMast1 = locMastService.selectById(innermostSideLocLBR);//娴�
- if (Cools.isEmpty(locMast1)){
- msg.append("璇烽�夋嫨娴呭簱浣嶅瓨鍦ㄧ殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(innermostSideLocLBR).append("/n");
- continue;
- }
- if (!locMast1.getLocSts().equals("O")){
- msg.append("璇烽�夋嫨娴呭簱浣嶇┖闂茬殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(locMast1.getLocNo()).append("/n");
- continue;
- }
- LocMast locMast = locMastService.selectById(locNo);//娣�
- if (Cools.isEmpty(locMast)){
- msg.append("璇烽�夋嫨娣卞簱浣嶅瓨鍦ㄧ殑璐т綅锛侊紒锛佷笉绗﹀悎鏉′欢搴撲綅锛�").append(locNo).append("/n");
- continue;
- }
- if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("O")){
- locMast1.setLocType1((short)2);
- locMast.setLocType1((short)2);
- locMast.setLocSts("Y");
- }else if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("Y")){
- locMast1.setLocType1((short)1);
- locMast.setLocType1((short)1);
- locMast.setLocSts("O");
- }else {
- msg.append("璇烽�夋嫨娣卞簱浣嶅簱浣嶇┖闂层�佽鍚堝苟鐨勮揣浣嶏紒锛侊紒涓嶇鍚堟潯浠跺簱浣嶏細").append(locMast.getLocNo()).append("/n");
- continue;
- }
- locMastService.updateById(locMast1);
- locMastService.updateById(locMast);
- }
- return R.ok(msg);
}
}
--
Gitblit v1.9.1