From 7182f72ba4781c620eebdf501ca46b3f69f5585d Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 15 二月 2022 11:11:09 +0800
Subject: [PATCH] 字段添加完成，测试完成
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 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 89f2d25..e604b6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -125,7 +125,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<MatCodeCountDto> matDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getSupplier(), elem.getCount(),elem.getMemo(),elem.getSource(),elem.getVendor()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, param.getBarcode(), userId);
// 鏇存柊婧愮珯鐐逛俊鎭�
@@ -223,18 +223,20 @@
}
int workNo = commonService.getWorkNo(rok);
- // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
boolean reduce = false;
- if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
- String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
- if (locNos.contains(shallowLoc)) {
- reduce = true;
+ if(locMast.getCrnNo().equals(1) && dto.getLocNo().substring(0,2).equals("01")) {//1鍙疯揣鏋舵墠鍒ゆ柇
+ // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
+ if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
+ if (locNos.contains(shallowLoc)) {
+ reduce = true;
+ }
}
- }
- // 娣卞簱浣嶇Щ搴�
- if (!reduce) {
- moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());
+ // 娣卞簱浣嶇Щ搴�
+ if (!reduce) {
+ moveLocForDeepLoc(locMast.getCrnNo(), dto.getLocNo());
+ }
}
// 鐢熸垚宸ヤ綔妗�
@@ -243,7 +245,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setIoPri(reduce?13D:15D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -274,6 +276,7 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
+ wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
@@ -405,10 +408,27 @@
for (String locNo : param.getLocNos()) {
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(1);
+
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
+ }
+
+ boolean reduce = false;
+ if(locMast.getCrnNo().equals(1) && locNo.substring(0,2).equals("01")) {//1鍙疯揣鏋舵墠鍒ゆ柇
+ // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
+ if (Utils.isDeepLoc(slaveProperties, locNo)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, locNo);
+ if (param.getLocNos().contains(shallowLoc)) {
+ reduce = true;
+ }
+ }
+
+ // 娣卞簱浣嶇Щ搴�
+ if (!reduce) {
+ moveLocForDeepLoc(locMast.getCrnNo(), locNo);
+ }
}
// 鑾峰彇婧愮珯
@@ -427,7 +447,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
- wrkMast.setIoPri(10D);
+ wrkMast.setIoPri(reduce?13D:15D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
@@ -485,6 +505,7 @@
@Override
@Transactional
+ //绉诲簱
public void locMove(String sourceLocNo, String locNo, Long userId) {
LocMast sourceLoc = locMastService.selectById(sourceLocNo);
if (Cools.isEmpty(sourceLoc)){
@@ -499,6 +520,18 @@
}
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+
+ if(loc.getCrnNo().equals(1) && sourceLocNo.substring(0,2).equals("01")) {//1鍙疯揣鏋舵墠鍒ゆ柇
+ // 褰撴繁搴撲綅鍑哄簱鏃讹紝鏌ユ壘瀵瑰簲鐨勬祬搴撲綅鏄惁涔熸湁鍑哄簱浠诲姟,濡傛灉鏈夛紝灏卞鍔犲叾浼樺厛绾�
+ if (Utils.isDeepLoc(slaveProperties, sourceLocNo)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, sourceLocNo);
+ LocMast locShallow = locMastService.selectById(shallowLoc);
+ if(!Cools.isEmpty(locShallow) && (locShallow.getLocSts().equals("F") || locShallow.getLocSts().equals("D"))){
+ moveLocForDeepLoc(loc.getCrnNo(), sourceLocNo);
+ }
+ }
+ }
+
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
@@ -619,6 +652,7 @@
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(locMast.getLocNo());
sqlParam.setMatNo(adjust.getMatNo());
+ sqlParam.setSupplier(adjust.getSupplier());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
// 淇濆瓨鏂板簱瀛樻槑缁�
if (Cools.isEmpty(one)) {
@@ -630,6 +664,15 @@
locDetl.setLocNo(locMast.getLocNo());
locDetl.setQty(adjust.getCount()); // 鏁伴噺
VersionUtils.setLocDetl(locDetl, matCode); // 鐗堟湰鎺у埗
+
+ if (Cools.isEmpty(adjust.getSupplier())){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ locDetl.setSupplier(sdf.format(new Date()));
+ }else {
+ locDetl.setSupplier(adjust.getSupplier());
+ }
+
+
locDetl.setModiUser(userId); // 鎿嶄綔浜哄憳淇℃伅
locDetl.setModiTime(new Date());
locDetl.setAppeUser(userId);
@@ -657,11 +700,13 @@
} else {
LocDetl sqlParam1 = new LocDetl();
sqlParam1.setQty(adjust.getCount());
+ sqlParam1.setSupplier(adjust.getSupplier());
sqlParam1.setModiTime(new Date());
sqlParam1.setModiUser(userId);
if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
.eq("loc_no", locMast.getLocNo())
- .eq("mat_no", adjust.getMatNo()))) {
+ .eq("mat_no", adjust.getMatNo())
+ .eq("supplier",adjust.getSupplier()))) {
throw new CoolException("淇敼搴撳瓨鏄庣粏澶辫触");
}
}
--
Gitblit v1.9.1