From 78a59eda850857e1bfeb48541f0c64d442877a4d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 08 四月 2025 11:17:10 +0800
Subject: [PATCH] #实现pda简单入库出库操作
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 109 ++++++++++++++++++++++--------------------------------
1 files changed, 45 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ebd138e..732b8f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -9,10 +9,7 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
-import com.zy.asrs.entity.param.FullStoreParam;
-import com.zy.asrs.entity.param.LocDetlAdjustParam;
-import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
@@ -160,57 +157,7 @@
@Override
@Transactional
public void startupFullTakeStore(StockOutParam param, Long userId) {
- ArrayList<String> locNos = new ArrayList<>();
- for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
- locNos.add(locDetl.getLocNo());
- }
- //妫�娴嬫槸鍚︿负娴呭簱浣�
- List<LocMast> locMasts = null;
- boolean sign=false;
- String th = "";
- for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
- int row = getRow(locDetl.getLocNo());
- int bay = getBay(locDetl.getLocNo());
- int lev = getLev(locDetl.getLocNo());
- if (!(row==4 || row==5)){
- if (row>5){
- locMasts=locMastService.selectList(new EntityWrapper<LocMast>().ge("row1", 5).le("row1", row)
- .eq("bay1",bay).eq("lev1",lev));
- for (LocMast locMast1:locMasts){
- if (locNos.contains(locMast1.getLocNo())){
- continue;
- }
- if (locMast1.getRow1()<row){
- if (!locMast1.getLocSts().equals("O")){
- sign=true;
- th="搴撲綅鍙凤細"+locDetl.getLocNo()+" 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
- break;
- }
- }
- }
- }else {
- locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4).ge("row1", row)
- .eq("bay1",bay).eq("lev1",lev));
- for (LocMast locMast1:locMasts){
- if (locNos.contains(locMast1.getLocNo())){
- continue;
- }
- if (locMast1.getRow1()>row){
- if (!locMast1.getLocSts().equals("O")){
- sign=true;
- th="搴撲綅鍙凤細"+locDetl.getLocNo()+" 娴呭簱浣嶆湁闈炵┖搴撲綅锛�";
- break;
- }
- }
- }
- }
- }
- }
- if (sign){
- throw new CoolException("鍑哄簱澶辫触锛�"+th);
- }
- // 鐩爣绔欑偣鐘舵�佹娴�
- BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
+
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
@@ -221,7 +168,7 @@
}
if (!locDetlDtos.isEmpty()) {
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
+ stockOut(null, locDetlDtos, null, userId);
} else {
throw new CoolException("搴撳瓨涓嶅瓨鍦�");
}
@@ -299,22 +246,25 @@
// 鑾峰彇璺緞
Boolean outMost = locMastService.isOutMost(dto.getLocNo(), false);
Integer outCrnNo = locMastService.getOutCrnNo(locMast);
- StaDesc staDesc = staDescService.queryCrnStn(ioType, outCrnNo, staNo.getDevNo());
+
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
- wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setWrkSts(ioType == 101?17L:9L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(ioType == 101?101:53); // 鍏ュ嚭搴撶姸鎬�
Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());
wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
wrkMast.setOutMost(outMost?1:0);;
wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
- wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
- wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
- wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ if (ioType == 101){
+ wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ }else {
+ wrkMast.setLocNo(dto.getLocNo());
+ }
+
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -349,7 +299,7 @@
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(dto.getLocNo());
if (locMast.getLocSts().equals("F")) {
- locMast.setLocSts(ioType==101?"R":"P");
+ locMast.setLocSts(ioType==101?"R":"Q");
locMast.setModiUser(userId);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -358,7 +308,7 @@
} else {
throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
}
- locMastService.breakUp(dto.getLocNo(), excludeLocNos);
+// locMastService.breakUp(dto.getLocNo(), excludeLocNos);
}
}
@@ -1202,4 +1152,35 @@
}
}
+ @Override
+ public StockOutParam selectGood(String barcode) {
+ // 鏌ヨ鎵樼洏涓婄殑鐗╂枡淇℃伅
+ // 鍘绘帀鍙兘鐨勫浣欏紩鍙锋垨鑰呯┖鏍�
+ barcode = barcode.replaceAll("\"", "").trim();
+
+ // 灏濊瘯灏� barcode 杞崲涓� int 绫诲瀷
+ int barcodeInt = Integer.parseInt(barcode);
+
+ List<LocDetl> locDetls = locDetlService.selectList(
+ new EntityWrapper<LocDetl>().eq("zpallet", barcodeInt)
+ );
+
+ if (locDetls == null || locDetls.isEmpty()) {
+ return null;
+ }
+
+ StockOutParam param = new StockOutParam();
+ param.setOutSite(101); // 鍙互鏍规嵁涓氬姟鍔ㄦ�佽缃嚭绔欏彛
+ param.setLocDetls(locDetls.stream().map(detl -> {
+ StockOutParam.LocDetl loc = new StockOutParam.LocDetl();
+ loc.setLocNo(detl.getLocNo());
+ loc.setMatnr(detl.getMatnr());
+ loc.setBatch(detl.getBatch());
+ loc.setCount(detl.getAnfme());
+ return loc;
+ }).collect(Collectors.toList()));
+
+ return param;
+ }
+
}
--
Gitblit v1.9.1