From 8b75fe61a3eefe36761aa0f82a79b59342aa6709 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 20 十月 2025 16:10:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 2eae903..c914c92 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -10,21 +10,19 @@
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.core.exception.CoolException;
+import com.zy.asrs.entity.*;
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;
+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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.*;
@RestController
@@ -36,6 +34,24 @@
private LocDetlService locDetlService;
@Autowired
private BasWhsService basWhsService;
+
+ @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) {
@@ -107,22 +123,106 @@
@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();
}
--
Gitblit v1.9.1