From 172506c26d7d1759f9ec3d5dd7c3897793343d07 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 九月 2024 16:58:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 98 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 14 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 2e8c7f3..2cd706e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -26,10 +26,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* 绉诲姩绔湇鍔℃牳蹇冪被
@@ -85,16 +82,27 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
+ if(param.getCombMats().size()>1){
+ throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
+ }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
+ if(param.getBarcode().length()!=8){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + 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()));
- if (countLoc > 0 || countWrk > 0) {
- throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + 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());
}
Date now = new Date();
@@ -139,7 +147,7 @@
// 鍏宠仈缁勬墭
} else {
Order order = orderService.selectByNo(param.getOrderNo());
- if (order.getSettle() > 2) {
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
// 鐢熸垚鍏ュ簱閫氱煡妗�
@@ -191,6 +199,7 @@
}
+ // 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
Date now = new Date();
@@ -211,14 +220,14 @@
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
}
if (Cools.isEmpty(combMat.getBatch())){
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
}
ManLocDetl manLocDetl = new ManLocDetl();
manLocDetl.setLocNo(locno);
manLocDetl.setNodeId(node.getId());
manLocDetl.setMaktx(mat.getMaktx());
manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setBatch(combMat.getBatch());
+ manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
if (!manLocDetlService.insert(manLocDetl)) {
@@ -227,15 +236,25 @@
}
}
+ // 鍟嗗搧涓嬫灦
@Override
public void offSale(OffSaleParam offSaleParam) {
- List<ManLocDetl> manLocDetls = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- if (Cools.isEmpty(manLocDetls)){
- throw new CoolException("鍟嗗搧涓嬫灦澶辫触锛�");
+ ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ if (Cools.isEmpty(manLocDetl)){
+ throw new CoolException("鏃犳鍟嗗搧锛�");
}
- int i = manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- System.out.println(i);
+ double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
+ if (anfme < 0) {
+ throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�");
+ } else if (anfme == 0){
+ manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ }
+ manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId());
}
+
+ // 鏌ユ壘鍟嗗搧
+
+
@Override
@Transactional
public void adjust(MobileAdjustParam param, Long userId) {
@@ -539,6 +558,57 @@
}
@Override
+// @Transactional
+ public void leftoversOut(Map<String, Object> map,Long userId) {
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", map.get("barcode")).eq("io_type", 103));
+ if (Cools.isEmpty(wrkMast)) {
+ throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟");
+ }
+ Date now = new Date();
+ int workNo = commonService.getWorkNo(1);
+ WrkMast wrkMast1 = new WrkMast();
+ wrkMast1.sync(wrkMast);
+ wrkMast1.setWrkNo(workNo);
+ wrkMast1.setWrkSts(2L);
+ wrkMast1.setIoType(200);
+ wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
+ wrkMast1.setStaNo(map.get("floor").hashCode() == 2 ? 204:304);
+ wrkMast1.setIoTime(now);
+ wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast1.setCrnNo(wrkMast.getCrnNo());
+ wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 婧愬簱浣�
+ wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast1.setPicking("N"); // 鎷ｆ枡
+ wrkMast1.setExitMk("N"); // 閫�鍑�
+ wrkMast1.setEmptyMk("N"); // 绌烘澘
+ wrkMast1.setLinkMis("N");
+ wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setBarcode(wrkMast.getBarcode());
+ if (!wrkMastService.insert(wrkMast1)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", map.get("barcode")));
+ if (Cools.isEmpty(wrkDetls)) {
+ throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟鏄庣粏");
+ }
+
+ for(WrkDetl wrkDetl : wrkDetls){
+ WrkDetl wrkDetl1 = new WrkDetl();
+ wrkDetl1.sync(wrkDetl);
+ wrkDetl1.setWrkNo(workNo);
+ wrkDetlService.insert(wrkDetl1);
+ }
+
+
+
+ }
+
+ @Override
@Transactional
public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now) {
--
Gitblit v1.9.1