From bb87914b329dbaf4e93850fe9c26c075708f13ef Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 四月 2025 16:22:13 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 140 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 127 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 45f0bbb..b56e0dd 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,11 +10,13 @@
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.asrs.service.WrkMastService;
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.*;
@@ -26,6 +28,16 @@
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private LocDetlService locDetlService;
+
+ @RequestMapping(value = "/locMast/init/pwd")
+ public R locMastInitPwd(@RequestParam(required = false) String pwd) {
+ if (Cools.isEmpty(pwd)) {
+ return R.error("璇疯緭鍏ュ彛浠�");
+ }
+ return R.ok().add(Parameter.get().getLocMastInitPwd().equals(pwd));
+ }
@PostMapping(value = "/group/empty/stock")
@ManagerAuth(memo = "鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅")
@@ -46,11 +58,40 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- excludeTrash(param);
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
+
+ try{
+ String locNo = null;
+ long whsType = 0L;
+ Integer crnNo = 0;
+ Integer row1 = 0;
+ Integer bay1 = 0;
+ Integer lev1 = 0;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (entry.getKey().equals("whsType")) {
+ whsType = Long.getLong(val);
+ }else if (entry.getKey().equals("locNo")) {
+ locNo = val;
+ }else if (entry.getKey().equals("crnNo")) {
+ crnNo = Integer.getInteger(val);
+ }else if (entry.getKey().equals("row1")) {
+ row1 = Integer.getInteger(val);
+ }else if (entry.getKey().equals("bay1")) {
+ bay1 = Integer.getInteger(val);
+ }else if (entry.getKey().equals("lev1")) {
+ lev1 = Integer.getInteger(val);
+ }
+ }
+ List<LocMast> locMastList = locMastService.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,0,10);
+ Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList);
+ page.setTotal(locMastService.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1));
+ return R.ok(page);
+ }catch (Exception e){
+ return R.error("寮傚父" + e);
+ }
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -104,15 +145,19 @@
@RequestMapping(value = "/locMastQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
- wrapper.like("loc_no", condition);
- Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
+
+ List<LocMast> locMastList = locMastService.selectLocMastList(condition,0,10);
+ Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList);
+ page.setTotal(locMastService.selectLocMastListTotal(condition));
+
List<Map<String, Object>> result = new ArrayList<>();
for (LocMast locMast : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locMast.getLocNo());
- map.put("value", locMast.getLocNo());
- result.add(map);
+ if (!Cools.isEmpty(locMast)){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", locMast.getLocNo());
+ map.put("value", locMast.getLocNo());
+ result.add(map);
+ }
}
return R.ok(result);
}
@@ -127,4 +172,73 @@
return R.ok();
}
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
+ public R update(LocMast locMast){
+ 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);
+ locMastService.toWmsLocStatus(locMast);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/locMast/init/auth")
+ @ManagerAuth(memo = "鍒濆鍖栧簱浣�")
+// @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;
+// }
+// }
+ 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);
+ }
+ }
+ }
+ locMastService.delete(new EntityWrapper<>());
+ locDetlService.delete(new EntityWrapper<>());
+ locMastService.insertBatch(list);
+ return R.ok("鍒濆鍖栨垚鍔�");
+ }
+
}
--
Gitblit v1.9.1