From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 06 十二月 2024 15:15:01 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 159 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 140 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 37b44bc..7c6f793 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
@@ -24,6 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -72,24 +74,39 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Resource
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+ @Resource
+ private BasDevpMapper basDevpMapper;
@Override
public R inLocCallAgv(String sta, String inSta) {
- // 鍒ゆ柇鍏ュ簱绔欑偣鏈夋棤鍑哄簱浠诲姟杩囨护鐩樼偣鎹℃枡
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", inSta).ne("wrk_sts",15).notIn("io_type",103,107));
- if (count > 0) {
- return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
+
+ BasDevp basDevp = basDevpMapper.selectById(inSta);
+ // 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
+ if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
+ // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
+ .eq("sta_no", inSta).lt("wrk_sts",14).in("io_type",101,103,107,110));
+ if (count == 0) {
+ // 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
+ basDevp.setDevMk("1");
+ basDevpMapper.updateById(basDevp);
+ } else {
+ return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
+ }
}
// 鍏堢粦瀹�
- boolean flag = bindPodAndBerth(sta);
- if (!flag) {
- return R.parse(inSta + "缁戝畾澶辫触");
- }
+// boolean flag = bindPodAndBerth(sta);
+// if (!flag) {
+// return R.parse(inSta + "缁戝畾澶辫触");
+// }
ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+ forwardAGVTaskParam.setClientCode("IWMS");
forwardAGVTaskParam.setTaskTyp("GT3");
forwardAGVTaskParam.setCtnrTyp("2");
forwardAGVTaskParam.setPriority("1");
@@ -248,23 +265,20 @@
throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
if(param.getBarcode().length()!=9){
throw new CoolException("鏉＄爜闀垮害涓嶆槸9浣�===>>" + param.getBarcode());
}
- if (param.getCombMats().size()>1){
- throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
- }
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0 || countwait > 0) {
- throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ if (countLoc > 0 || countWrk > 0) {
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
Date now = new Date();
@@ -360,13 +374,85 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setManu(detlDto.getMark());
+ waitPakin.setManu(detlDto.getMark()); //鏍囪
+ waitPakin.setOrigin(order.getItemName());//浠撳簱
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
orderService.updateSettle(order.getId(), 2L, userId);
}
+
+ }
+
+ @Override
+ @Transactional
+ public void mergeComb(CombParam param, Long userId) {
+
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ if(param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)){
+ throw new CoolException("鍏ュ簱鐗╂枡鏁伴噺涓嶈兘涓虹┖");
+ }
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 104){
+ throw new CoolException(param.getBarcode() + "璇ユ潯鐮佹暟鎹笉涓哄苟鏉垮嚭搴�");
+ }
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
+ Date now = new Date();
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ }
+ if (combMat.getAnfme() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+
+ Mat mat = matService.selectByMatnr(combMat.getMatnr());
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setBatch(combMat.getBatch());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setOrderNo(param.getOrderNo());
+ wrkDetl.setZpallet(param.getBarcode());
+ wrkDetl.setAnfme(combMat.getAnfme());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setManu(orderDetl.getManu());
+ wrkDetlService.insert(wrkDetl);
+ }
+
+
+
+
}
@@ -733,6 +819,13 @@
public void leftoversOut(Map<String, Object> map,Long userId) {
String barcode = map.get("barcode").toString();
String barcode2 = map.get("barcode2").toString();
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",barcode2));
+ int countWrk = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode",barcode2).ne("io_type",200));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode2));
+ if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+ throw new CoolException("璇ユ潯鐮佸凡琚娇鐢�===>>" + barcode2);
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 103));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟");
@@ -786,6 +879,34 @@
}
@Override
+ public void pdaAdjust(pdaAdjustParam param, Long userId) {
+ if (Cools.isEmpty(param)){
+ throw new CoolException("鐩樼偣鍒楄〃鍙傛暟涓虹┖");
+ }
+ for (InventoryCheckOrderDetl orderDetl: param.getParam()){
+ InventoryCheckOrderDetl inventoryCheckOrderDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
+ .eq("order_no", orderDetl.getOrderNo())
+ .eq("matnr", orderDetl.getMatnr())
+ .eq("batch", orderDetl.getBatch()));
+ if (Cools.isEmpty(inventoryCheckOrderDetl)){
+ throw new CoolException("鏈煡璇㈠埌鐩樼偣淇℃伅");
+ }
+ if (!inventoryCheckOrderDetl.getStatus().equals("1")){
+ throw new CoolException("璇ヤ换鍔″凡鐩樼偣");
+ }
+ inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme());
+ inventoryCheckOrderDetl.setStatus("2");
+ if (!inventoryCheckOrderDetlService.updateById(inventoryCheckOrderDetl)){
+ throw new CoolException("淇濆瓨鐩樼偣淇℃伅澶辫触!");
+ }
+
+ }
+
+
+
+ }
+
+ @Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now) {
--
Gitblit v1.9.1