From bb2ba875a4c7ed5f0c31a216862c5fd4cbf88c6e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 19 九月 2025 09:24:24 +0800
Subject: [PATCH] 新增仓库 新增库区 新增缓冲区库位
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 253 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 192 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index a5aea8f..723e3f6 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,17 +10,19 @@
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.core.exception.CoolException;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.mapper.LocDetlMapper;
+import com.zy.asrs.service.*;
import com.zy.common.entity.Parameter;
import com.zy.common.model.Shelves;
+import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.*;
@RestController
@@ -30,6 +32,20 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private BasWhsTypeService basWhsTypeService;
+ @Resource
+ private WrkMastService wrkMastService;
+ @Resource
+ private AdjDetlService adjDetlService;
+ @Resource
+ private LocDetlMapper locDetlMapper;
+ @Resource
+ private CommonService commonService;
+ @Resource
+ private WrkMastLogService wrkMastLogService;
+ @Resource
+ private WrkDetlLogService wrkDetlLogService;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -53,28 +69,39 @@
@RequestMapping(value = "/locMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @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));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ boolean sign = false;
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
+ } else if (entry.getKey().equals("loc_no")) {
wrapper.like(entry.getKey(), val);
+ } else {
+ if (entry.getKey().equals("loc_type1")) {
+ sign = true;
+ }
+ wrapper.eq(entry.getKey(), val);
}
+ }
+ if (sign) {
+ wrapper.and().ne("loc_sts", "Y");
}
}
@@ -89,36 +116,120 @@
return R.ok();
}
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth(memo = "搴撲綅淇敼")
- public R update(LocMast locMast){
- if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
+ public R update(LocMast locMast) {
+
+ if (Cools.isEmpty(locMast) || null == locMast.getLocNo()) {
return R.error();
}
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("source_loc_no", locMast.getLocNo())
+ .or().eq("loc_no", locMast.getLocNo()));
+ if (!Cools.isEmpty(wrkMast)) {
+ return R.error("璇ュ簱浣嶆鍦ㄤ綔涓氾紝璇峰厛澶勭悊宸ヤ綔妗�");
+ }
+
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠＄悊鍛�");
}
+ Date now = new Date();
// 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
- if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
+ if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F") || oldLocMast.getLocSts().equals("S")) {
if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
- locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ // 娣诲姞鍘嗗彶宸ヤ綔涓绘。
+ WrkMastLog wrkMastLog = new WrkMastLog();
+ wrkMastLog.setWrkNo(commonService.getWorkNo(3));
+ wrkMastLog.setIoTime(now);
+ wrkMastLog.setWrkSts(5);
+ wrkMastLog.setIoType(19);
+ wrkMastLog.setIoPri(13D); // 浼樺厛绾�
+ wrkMastLog.setCrnNo(locMast.getCrnNo());
+ wrkMastLog.setSourceLocNo(locMast.getLocNo());
+ wrkMastLog.setLocNo(locMast.getLocNo());
+ wrkMastLog.setBarcode(locMast.getBarcode()); // 鎵樼洏鐮�
+ wrkMastLog.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMastLog.setPicking("N"); // 鎷ｆ枡
+ wrkMastLog.setExitMk("N"); // 閫�鍑�
+ wrkMastLog.setEmptyMk("N"); // 绌烘澘
+ wrkMastLog.setLinkMis("Y");
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMastLog.setAppeTime(now);
+ wrkMastLog.setModiTime(now);
+ wrkMastLog.setAppeUser(getUserId());
+ wrkMastLog.setModiUser(getUserId());
+ boolean res = wrkMastLogService.insert(wrkMastLog);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ for (LocDetl locDetl : locDetls) {
+ // 淇濆瓨璋冩暣璁板綍
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locDetl.getLocNo());
+ adjDetl.setMatnr(locDetl.getMatnr());
+ adjDetl.setBatch(locDetl.getBatch());
+ adjDetl.setOriQty(locDetl.getAnfme());
+ adjDetl.setAdjQty(0.0D);
+ adjDetl.setModiTime(now);
+ adjDetl.setModiUser(getUserId());
+ adjDetl.setAppeTime(now);
+ adjDetl.setAppeUser(getUserId());
+ if (!adjDetlService.insert(adjDetl)) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+
+ // 娣诲姞鍘嗗彶宸ヤ綔鏄庣粏
+ WrkDetlLog wrkDetl = new WrkDetlLog();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setWrkNo(wrkMastLog.getWrkNo());
+ wrkDetl.setIoTime(wrkMastLog.getIoTime());
+ wrkDetl.setAnfme(0.0);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ wrkMastLog.setAppeUser(getUserId());
+ wrkMastLog.setModiUser(getUserId());
+ if (!wrkDetlLogService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ locMast.setBarcode("");
}
}
locMast.setModiUser(getUserId());
- locMast.setModiTime(new Date());
- locMastService.updateById(locMast);
+ locMast.setModiTime(now);
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setLocNo(locMast.getLocNo());
+ adjDetl.setMatnr("鍘熷簱浣嶇姸鎬侊細" + oldLocMast.getLocSts());
+ adjDetl.setBatch("鏇存敼搴撲綅鐘舵�佷负锛�" + locMast.getLocSts());
+ adjDetl.setModiTime(now);
+ adjDetl.setModiUser(getUserId());
+ if (!adjDetlService.insert(adjDetl)) {
+ throw new CoolException("搴撲綅璋冩暣璁板綍澶辫触");
+ }
+ // 搴撲綅鍐荤粨->鍐荤粨鎵�鏈夊簱瀛�
+ if (locMast.getFrozen() == 1 && oldLocMast.getFrozen() == 0 && locMast.getLocSts().equals("F") && oldLocMast.getLocSts().equals("F")) {
+ locDetlMapper.updateDetlFrozenByLocNo(oldLocMast.getLocNo());
+ }
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
return R.ok();
}
@RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocMast entity : list){
+ for (LocMast entity : list) {
locMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -126,7 +237,7 @@
@RequestMapping(value = "/locMast/export/auth")
@ManagerAuth(memo = "搴撲綅瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
@@ -142,7 +253,7 @@
wrapper.like("loc_no", condition);
Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocMast locMast : page.getRecords()){
+ for (LocMast locMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locMast.getLocNo());
map.put("value", locMast.getLocNo());
@@ -155,7 +266,7 @@
@ManagerAuth
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)){
+ if (null != locMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -165,43 +276,63 @@
@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;
+ try {
+ List<LocMast> list = new ArrayList<>();
+ BasWhsType basWhsType = basWhsTypeService.selectByIdentifying(param.getIdentifying());
+ if (Cools.isEmpty(basWhsType)) {
+ return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
+ }
+ 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("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
+
+ 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(basWhsType.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("鍒濆鍖栨垚鍔�");
+ } catch (Exception e) {
+ return R.error("鍒濆鍖栧け璐�===>" + e.getMessage());
}
-// locMastService.delete(new EntityWrapper<>());
- locDetlService.delete(new EntityWrapper<>());
- locMastService.insertBatch(list);
- return R.ok("鍒濆鍖栨垚鍔�");
}
}
--
Gitblit v1.9.1