From 52bf6adbb12da2690be2db07fd6620844e84e6d3 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 23 十月 2025 16:46:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 2cefd0f..7dc807d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -13,9 +13,11 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDto;
import com.zy.common.model.MesCombParam;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
@@ -553,8 +555,8 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- if(param.getBarcode().length()!=8){
- throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
+ if(param.getBarcode().length()!=6){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸6浣�===>>" + param.getBarcode());
}
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
@@ -603,6 +605,12 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -658,6 +666,12 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -812,8 +826,36 @@
@Override
@Transactional
public void kittingCall(String locNo, Long userId) {
+ try{
+ List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
-
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+ if (locMast.getLocSts().equals("F")){
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
+ for (LocDetl locDetl:locDetlList){
+ StockOutParam.LocDetl locDto = new StockOutParam.LocDetl();
+ locDto.setLocNo(locDetl.getLocNo());
+ locDto.setMatnr(locDetl.getMatnr());
+ locDto.setBatch(locDetl.getBatch());
+ locDto.setBrand(locDetl.getBrand());
+ locDto.setCount(locDetl.getAnfme());
+ locDto.setStandby1(locDetl.getStandby1());
+ locDto.setStandby2(locDetl.getStandby2());
+ locDto.setStandby3(locDetl.getStandby3());
+ locDto.setBoxType1(locDetl.getBoxType1());
+ locDto.setBoxType2(locDetl.getBoxType2());
+ locDto.setBoxType3(locDetl.getBoxType3());
+ locDetls.add(locDto);
+ }
+ }
+ StockOutParam param = new StockOutParam();
+ param.setOutSite(101);
+ param.setLocDetls(locDetls);
+ WorkService workService = SpringUtils.getBean(WorkService.class);
+ workService.locCheckOut(param,userId);
+ } catch (Exception e){
+ throw new CoolException("鐩樼偣鍚姩澶辫触锛侊紒锛�");
+ }
}
@Override
--
Gitblit v1.9.1