From fdb6c647f4b9bf1a9dae9349cfd64a5e533433d2 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期四, 21 九月 2023 09:38:59 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 521 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 435 insertions(+), 86 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 4123069..1e42f78 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
@@ -167,46 +168,94 @@
locs.add(one.getLocNo());
}
- //鍑哄簱鏃讹紝濡傛灉褰撳墠搴撲綅缁勬湁鐩稿悓鐨勭墿鏂欙紝鍒欏厛鍑哄渚х墿鏂�
- for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
- List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
- outerSingleLoc.add(locDetl.getLocNo());
- boolean flag = false;
- Double useCount = 0D;
- for (String locNo : outerSingleLoc) {
- if(locs.contains(locNo)) continue;
- for (LocDetl locDetl0 : locDetlService.selectByLocNo(locNo)) {
- if (!locDetl0.getMatnr().equals(locDetl.getMatnr())) {
- //涓嶆槸鐩稿悓鐗╂枡
- continue;
- }
- double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺
- double realCount = 0;//瀹為檯鎻愪緵鏁伴噺
- if (lastCount==0){
- continue;
- }
- if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵
- realCount = lastCount;
- } else {
- //瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵
- realCount = locDetl0.getAnfme();
- }
- useCount += realCount;//宸蹭娇鐢ㄧ殑鏁伴噺
-
- locDetls.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount));
- flag = true;
- if (useCount >= locDetl.getCount()) {
- //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠�
- break;
+ List<StockOutParam.LocDetl> stockOutParamLocDetlSort = Utils.getStockOutParamLocDetlSort(param.getLocDetls());
+ boolean sign = true;
+ List<String> locNoWeighting = new ArrayList<>();
+ for (StockOutParam.LocDetl locDetl : stockOutParamLocDetlSort) {
+ if (Cools.isEmpty(locNoWeighting)){
+ locNoWeighting.add(locDetl.getLocNo());
+ }else {
+ if (!Utils.getLocNoWeighting(locNoWeighting,locDetl.getLocNo())){
+ locNoWeighting.add(locDetl.getLocNo());
+ sign = true;
+ }
+ }
+ if (sign){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ //鑾峰彇鍚屼竴搴撲綅缁勭殑澶栦晶搴撲綅鍙�
+ List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
+ if (locMast.getLocType2().equals((short)3)){
+ groupOuterSingleLoc = Utils.getGroupOuterSingleLocLowFrequency(locDetl.getLocNo());
+ sign = false;
+ }
+ for (String locNo : groupOuterSingleLoc) {
+ //姣忎釜搴撲綅鐨勫簱浣嶆槑缁�
+ if(locs.contains(locNo)) continue;
+ for (LocDetl detl : locDetlService.selectByLocNo(locNo)) {
+ if (!detl.getMatnr().equals(locDetl.getMatnr())) {
+ //涓嶆槸鐩稿悓鐗╂枡
+ if (!sign){
+ locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
+ }
+ continue;
+ }
+ locDetls.add(new StockOutParam.LocDetl(detl.getLocNo(), detl.getMatnr(), detl.getBatch(), detl.getAnfme()));
}
}
}
-
- if (!flag) {
- locDetls.add(locDetl);
- }
-
+ locDetls.add(locDetl);
}
+ //鍑哄簱鏃讹紝濡傛灉褰撳墠搴撲綅缁勬湁鐩稿悓鐨勭墿鏂欙紝鍒欏厛鍑哄渚х墿鏂� 6.30鏃� 娉ㄩ噴
+ //for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
+ // List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
+ // boolean flag = false;
+ // Double useCount = 0D;
+ // for (String locNo : outerSingleLoc) {
+ // if(locs.contains(locNo)) continue;
+ // for (LocDetl locDetl0 : locDetlService.selectByLocNo(locNo)) {
+ // if (!locDetl0.getMatnr().equals(locDetl.getMatnr())) {
+ // //涓嶆槸鐩稿悓鐗╂枡
+ // continue;
+ // }
+ // double lastCount = locDetl.getCount() - useCount;//鍓╀綑鎵�闇�鏁伴噺
+ // double realCount = 0;//瀹為檯鎻愪緵鏁伴噺
+ // if (lastCount==0){
+ // continue;
+ // }
+ // if (locDetl0.getAnfme() >= lastCount) {//瀹為檯鏁伴噺澶т簬鎵�闇�鏁伴噺锛屾寜鎵�闇�鏁伴噺鎻愪緵
+ // realCount = lastCount;
+ // } else {
+ // //瀹為檯灏忎簬鎵�闇�鏁伴噺锛屾寜瀹為檯鏁伴噺鎻愪緵
+ // realCount = locDetl0.getAnfme();
+ // }
+ // useCount += realCount;//宸蹭娇鐢ㄧ殑鏁伴噺
+ //
+ // locDetls.add(new StockOutParam.LocDetl(locDetl0.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), realCount));
+ // flag = true;
+ // if (useCount >= locDetl.getCount()) {
+ // //鎵惧埌鐨勫簱瀛� >= 鎵�闇�搴撳瓨锛屾弧瓒虫潯浠�
+ // break;
+ // }
+ // }
+ // }
+ //
+ // if (!flag) {
+ // locDetls.add(locDetl);
+ // }
+ //
+ //}
+
+ // TODO: 2023/6/28 绛夋潕钖囩‘璁ゆ槸鍚︿娇鐢�
+ // ----------------------------------------------
+ //for(StockOutParam.LocDetl one : param.getLocDetls()){
+ // List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(one.getLocNo());
+ // for (String s : outerSingleLoc) {
+ // if (!locs.contains(s)) {
+ // throw new CoolException("娴呭簱浣嶆湁鐩稿悓鐗╂枡涓嶆敮鎸佸嚭搴�");
+ // }
+ // }
+ //}
+ // ----------------------------------------------
// ArrayList<String> locNos = new ArrayList<>();
// for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
@@ -268,11 +317,16 @@
if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
}
}
+ for (LocDetlDto locDetlDto:locDetlDtos){
+ if (locs.contains(locDetlDto.getLocDetl().getLocNo())){
+ locDetlDto.setSign(true);
+ }
+ }
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
+ stockOut2(staNo, locDetlDtos, null, userId);
}else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
}
@@ -420,6 +474,7 @@
@Override
@Transactional
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
+ Integer basDevp = staNo.getDevNo();
Date now = new Date();
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
@@ -463,6 +518,10 @@
}
List<String> outerLocs = Utils.getGroupOuterSingleLoc(locNo);
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
+ if (locMast1.getLocType2().equals((short)3)){
+ outerLocs = Utils.getGroupOuterSingleLocLowFrequency(locMast1.getLocNo());
+ }
Double wrkPri = 15D;
for (String outerLoc : outerLocs) {
LocMast locMast = locMastService.selectById(outerLoc);
@@ -473,7 +532,9 @@
if (!locMast.getLocSts().equals("F")) {
continue;
}
-
+ //if (locMast.getLocSts().equals("F")) {
+ // throw new CoolException("娴呭簱浣嶅湪搴撲笉鏀寔姝や换鍔�");
+ //}
boolean flag = false;
for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
if (!locDetl.getMatnr().equals(matnr)) {
@@ -502,7 +563,8 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(101); // 鍏ュ嚭搴撶姸鎬�101鍏ㄦ澘鍑哄簱
wrkPri += 2D;
- wrkMast.setIoPri(wrkPri); // 浼樺厛绾�
+
+ wrkMast.setIoPri(Utils.getIoPri(locMast.getLocNo())); // 浼樺厛绾�
wrkMast.setOutMost(0);
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
@@ -543,6 +605,10 @@
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(locDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ int zpallet = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", locDetl.getZpallet()).ne("loc_no",locDetl.getLocNo()));
+ if (zpallet>0) {
+ throw new CoolException(locDetl.getZpallet() + "鍏ュ簱閫氱煡妗ｄ腑宸插瓨鍦�");
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
@@ -595,13 +661,226 @@
//-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜-----------------------
if (ioType!=107){
List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
- if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
- //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
- ioType = 101;
+ //if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
+ // //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
+ // ioType = 101;
+ // if (staNo.getDevNo()==300){
+ // staNo.setDevNo(200);
+ // }
+ //}
+ if (ioType == 101) {
if (staNo.getDevNo()==300){
- staNo.setDevNo(200);
+ if(locMast.getCrnNo() == 1) {
+ staNo.setDevNo(100);
+ } else {
+ staNo.setDevNo(200);
+ }
+
+ }
+ } else {
+ staNo.setDevNo(basDevp);
+ }
+
+
+ }
+ //-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜end-----------------------
+
+ // 鑾峰彇璺緞
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
+ if(staDesc == null){
+ throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+ }
+
+ // 鐢熸垚宸ヤ綔鍙�
+ 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); // 鍏ュ嚭搴撶姸鎬�
+ Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());
+ wrkMast.setIoPri(15D); // 浼樺厛绾э細13
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
+ continue;
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(detlDto.getLocDetl());
+ wrkDetl.setOrderNo(""); // 鎵嬪姩鍑哄簱涓嶉渶瑕佸甫鍑哄簱瀛樹腑鐨勫崟鎹紪鍙�
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ Double anfme = ioType == 101 ? detlDto.getLocDetl().getAnfme() : detlDto.getCount();
+ wrkDetl.setAnfme(anfme); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setSpecs(detlDto.getLocDetl().getSpecs());
+ wrkDetl.setMatType(detlDto.getLocDetl().getMatType());
+ wrkDetl.setZpallet(locMast.getBarcode());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("F")) {
+ locMast.setLocSts(ioType == 101 ? "R" : "P");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + dto.getLocNo());
+ }
+ } else {
+ throw new CoolException(dto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+// locMastService.breakUp(dto.getLocNo(), excludeLocNos);
+ }
+ }
+
+ @Override
+ @Transactional
+ public void stockOut2(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
+ Integer basDevp = staNo.getDevNo();
+ Date now = new Date();
+ // 鍚堝苟鍚岀被椤�
+ Set<String> locNos = new HashSet<>();
+ List<OutLocDto> dtos = new ArrayList<>();
+ for (LocDetlDto locDetlDto : locDetlDtos) {
+ String locNo = locDetlDto.getLocDetl().getLocNo();
+ if (locNos.contains(locNo)) {
+ for (OutLocDto dto : dtos) {
+ if (dto.getLocNo().equals(locNo)) {
+ dto.getLocDetlDtos().add(locDetlDto);
+ break;
}
}
+ } else {
+ locNos.add(locNo);
+ dtos.add(new OutLocDto(locNo, locDetlDto));
+ }
+ }
+ Integer ioType = null;
+ // 鐢熸垚宸ヤ綔妗�
+ for (OutLocDto dto : dtos) {
+ // 濡傛灉涓烘繁搴撲綅锛屼笖瀵瑰簲娴呭簱浣嶄负X.绂佺敤锛屽垯鐣ヨ繃姝ゅ簱浣�
+ if (Utils.isDeepLoc(slaveProperties, dto.getLocNo())) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, dto.getLocNo());
+ if (locMastService.selectById(shallowLoc).getLocSts().equals("X")) {
+ continue;
+ }
+ }
+
+ //-----------------2023.5.31涓婃灦鍖哄煙鐗堟湰鍏煎浠ｇ爜-----------------------
+ //鍒ゆ柇褰撳墠搴撲綅缁勬槸鍚﹀潎涓哄悓涓�绉嶇墿鏂欙紝濡備笉鏄紝鍒欒瀹氶渶瑕佹墽琛屽吋瀹逛唬鐮�
+ //闇�瑕佸皢寰呭嚭搴撳簱浣嶅墠渚у簱浣�(涓嶅寘鍚渶澶栦晶楂橀搴撲綅)鎵ц101鍏ㄦ澘鍑哄簱
+ String locNo = dto.getLocNo();
+ String matnr = null;
+ for (LocDetlDto locDetlDto : dto.getLocDetlDtos()) {
+ LocDetl locDetl = locDetlDto.getLocDetl();
+ if (locDetl.getLocNo().equals(locNo)) {
+ matnr = locDetl.getMatnr();
+ }
+ }
+
+ List<String> outerLocs = new ArrayList<>();
+ if (!dto.isSign()){
+ outerLocs.add(dto.getLocNo());
+ }
+ Double wrkPri = 15D;
+ for (String outerLoc : outerLocs) {
+ if (!dto.isSign()) {
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ for (LocDetl locDetl : locDetlService.selectByLocNo(outerLoc)) {
+
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(locDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ int zpallet = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", locDetl.getZpallet()).ne("loc_no",locDetl.getLocNo()));
+ if (zpallet>0) {
+ throw new CoolException(locDetl.getZpallet() + "鍏ュ簱閫氱煡妗ｄ腑宸插瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch("");
+ waitPakin.setZpallet(locDetl.getZpallet()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(locDetl.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ waitPakin.setMemo(locDetl.getMemo());
+ waitPakin.setFrozen(0); // 鏄惁鍐荤粨
+ waitPakin.setManu(locDetl.getManu());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ }
+ }
+ //-----------------2023.5.31涓婃灦鍖哄煙鐗堟湰鍏煎浠ｇ爜end-----------------------
+
+ // 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
+ if (ioWorkType == null) {
+ ioType = dto.isAll() ? 101 : 103;
+ } else if (ioWorkType.equals(IoWorkType.CHECK_OUT)) {
+ ioType = 107;
+ // if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
+ // throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
+ // }
+ }
+ assert ioType != null;
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+
+ //-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜-----------------------
+ if (ioType!=107){
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
+ //if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
+ // //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
+ // ioType = 101;
+ // if (staNo.getDevNo()==300){
+ // staNo.setDevNo(200);
+ // }
+ //}
+ if (ioType == 101) {
+ if (staNo.getDevNo()==300){
+ if(locMast.getCrnNo() == 1) {
+ staNo.setDevNo(100);
+ } else {
+ staNo.setDevNo(200);
+ }
+
+ }
+ } else {
+ staNo.setDevNo(basDevp);
+ }
+
+
}
//-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜end-----------------------
@@ -682,6 +961,54 @@
@Transactional
public void stockOut(BasDevp staNo, TaskDto taskDto, Long userId) {
Date now = new Date();
+ if (Cools.isEmpty(taskDto.getLocDtos()) || taskDto.getLocDtos().size()==0){
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectById(taskDto.getLocNo());
+ // 鑾峰彇璺緞
+ int ioType = locMast.getLocSts().equals("D") ? 110 : 101;
+ StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), 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); // 鍏ュ嚭搴撶姸鎬�
+ Double ioPri = wrkMastService.getIoPri(ioType, taskDto.getLocNo());
+ wrkMast.setIoPri(ioPri); // 浼樺厛绾э細13
+ wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo(), false) ? 1 : 0);
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt(ioType==110? "N":"Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk(ioType==110? "Y":"N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + taskDto.getLocNo());
+ }
+ // 淇敼搴撲綅鐘舵��: F銆丏.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ locMast = locMastService.selectById(taskDto.getLocNo());
+ if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ) {
+ locMast.setLocSts("R");
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細" + taskDto.getLocNo());
+ }
+ } else {
+ throw new CoolException(taskDto.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ return;
+ }
List<LocDto> locDtos = taskDto.getLocDtos();
for (LocDto locDto : locDtos) {
if (!taskDto.getLocNo().equals(locDto.getLocNo()) && !taskDto.getStaNo().equals(locDto.getStaNo())) {
@@ -748,51 +1075,72 @@
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- // 淇敼璁㈠崟鏄庣粏
- if (!BaseController.isJSON(locDto.getOrderNo())) {
- String[] orderNos = GetOrderNo(locDto.getOrderNo());
- if (!Cools.isEmpty(orderNos)){
- Double anfme = locDto.getAnfme();
- for (String orderNo : orderNos) {
- OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
+ if (!wrkDetl.getOrderNo().equals("浼寸敓鍑哄簱")){
+ // 淇敼璁㈠崟鏄庣粏
+ if (!BaseController.isJSON(locDto.getOrderNo())) {
+ String[] orderNos = GetOrderNo(locDto.getOrderNo());
+ if (!Cools.isEmpty(orderNos) && orderNos.length!=0){
+ Double anfme = locDto.getAnfme();
+ for (String orderNo : orderNos) {
+ OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
+ }
+ if (orderDetl.getAnfme() <= anfme) {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ anfme = anfme - orderDetl.getAnfme();
+ } else {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
- if (orderDetl.getAnfme() <= anfme) {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- anfme = anfme - orderDetl.getAnfme();
- } else {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
+ }else {
+ OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ }
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
- }else {
- OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
- }
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
- }
- } else {
- // 璁㈠崟鍚堝苟鍑哄簱
- List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
+ } else {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ List<OrderDto> orderDtoList = JSON.parseArray(locDto.getOrderNo(), OrderDto.class);
- for (OrderDto orderDto : orderDtoList) {
- OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null);
+ for (OrderDto orderDto : orderDtoList) {
+ OrderDetl orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(orderDto.getOrderNo(), locDto.getMatnr(), null);
+ }
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDto.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
+ }
+ }else {//鑷姩缁勬墭
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(wrkDetl.getBatch());
+ waitPakin.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ waitPakin.setMemo(wrkDetl.getMemo());
+ waitPakin.setFrozen(wrkDetl.getFrozen()); // 鏄惁鍐荤粨
+ waitPakin.setManu(wrkDetl.getManu());
+ waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
}
@@ -983,9 +1331,9 @@
@Override
@Transactional
public void locCheckOut(StockOutParam param, Long userId) {
- // if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
- // throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
- // }
+// if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
+// throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
+// }
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
@@ -1292,7 +1640,7 @@
} else if (wrkMast.getIoType() == 110) {
locSts = "D";
// 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
- } else if (wrkMast.getIoType() == 11) {
+ } else if (wrkMast.getIoType() == 11 || wrkMast.getIoType() == 111) {
if (wrkMast.getWrkSts() > 11){
throw new CoolException("绉诲簱浠诲姟宸插湪鎵ц涓紝涓嶈兘鍙栨秷");
}
@@ -1389,6 +1737,7 @@
if (!wrkMastRes || !locMastRes) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
+ waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
}
@Override
--
Gitblit v1.9.1