From 228ad4f5ea9b6f0c5af8110072cf00dcb27c4b60 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 02 七月 2024 08:38:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 21 -------
src/main/java/com/zy/asrs/controller/MobileController.java | 34 -----------
src/main/java/com/zy/common/service/CommonService.java | 74 +++++++++++++++++++++---
3 files changed, 63 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 630bdd7..b9169d8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -59,8 +59,6 @@
private CommonService commonService;
@Autowired
private MatService matService;
- @Autowired
- private BomMatService bomMatService;
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -120,38 +118,6 @@
return R.ok("缁勬墭鎴愬姛");
}
- @RequestMapping("/comb/checkBom")
- @ManagerAuth(memo = "鏍￠獙Bom")
- public R checkBom(@RequestBody CheckBom checkBom){
- BomMat bomMat = new BomMat();
- // 娌℃湁杈撳叆bom鍙锋甯哥粍鎵�
- if (Cools.isEmpty(checkBom.getBomCode())) {
- return R.ok();
- }
-
- if (Cools.isEmpty(checkBom.getMatnr())) {
- return R.ok().add(bomMat);
- } else {
- // 妫�鏌ユ槸鍚﹀湪bom娓呭崟鍐�
- bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", checkBom.getBomCode()).eq("element_num", checkBom.getMatnr()));
- if (Cools.isEmpty(bomMat)) {
- throw new CoolException("褰撳墠鐗╂枡" + checkBom.getMatnr() + "涓嶅湪Bom娓呭崟鍐�");
- } else {
- // 妫�鏌ュ簱瀛樹腑鏄惁鏈夊綋鍓峛om鐨勭墿鏂�
- Double bomQyt = locDetlService.getBomQyt(checkBom.getBomCode(), checkBom.getMatnr());
- if (!Cools.isEmpty(bomQyt)) {
- bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
- }
- Double bomQty = wrkDetlService.getBomQty(checkBom.getBomCode(), checkBom.getMatnr());
- if (!Cools.isEmpty(bomQty)) {
- bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
- }
- // 妫�鏌ュ伐浣滄。涓槸鍚︽湁褰撳墠bom鐨勭墿鏂�
-
- }
- }
- return R.ok().add(bomMat);
- }
@RequestMapping("/pack/get/auth")
@ManagerAuth
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 9248666..43b9ef0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -79,8 +79,6 @@
private DocTypeService docTypeService;
@Autowired
private MatV2Service matV2Service;
- @Autowired
- private BomMatService bomMatService;
@Override
@Transactional
@@ -292,25 +290,6 @@
waitPakin.setBrand("缁勪欢");
} else {
waitPakin.sync(mat);
- }
- // 鏍￠獙鏄惁涓篵om鍏ュ簱 bom鍏ュ簱鐨勬暟閲忎笉鑳借秴杩囧簱瀛樺師鏈夋暟閲�
- if (!Cools.isEmpty(param.getBomCode())) {
- BomMat bomMat = bomMatService.selectOne(new EntityWrapper<BomMat>().eq("unit_num", param.getBomCode()).eq("element_num", detlDto.getMatnr()));
- Double bomQyt = locDetlService.getBomQyt(param.getBomCode(), detlDto.getMatnr());
- if (!Cools.isEmpty(bomQyt)) {
- bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQyt);
- }
- Double bomQty = wrkDetlService.getBomQty(param.getBomCode(), detlDto.getMatnr());
- if (!Cools.isEmpty(bomQty)) {
- bomMat.setZpalletAnfme(bomMat.getZpalletAnfme() - bomQty);
- }
- if (bomMat.getZpalletAnfme() == 0.0D) {
- throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡宸插叆鏈�澶ф暟閲�");
- } else {
- if (bomMat.getZpalletAnfme() < detlDto.getAnfme()) {
- throw new CoolException(detlDto.getMatnr() + "褰撳墠鐗╂枡鏈�澶氬彲鍏�" + bomMat.getZpalletAnfme() + "浠�");
- }
- }
}
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bd21470..e107684 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -97,7 +97,8 @@
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
-// whsType = getWhsType(sourceStaNo, times);
+ //whsType = getWhsType(sourceStaNo, times);
+
StartupDto startupDto = new StartupDto();
@@ -107,6 +108,7 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
+ // ===============>>>> 寮�濮嬫墽琛�
// ===============>>>> 寮�濮嬫墽琛�
int curRow = rowLastno.getCurrentRow();
int sRow = rowLastno.getsRow();
@@ -118,14 +120,60 @@
// 鐩爣搴撲綅
LocMast locMast = null;
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matNos)) {
+ List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
+ for (String locNo : locNos) {
+ if (Utils.isShallowLoc(slaveProperties, locNo)) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ if (locMasts.size() > 0) {
+ for (LocMast loc : locMasts) {
+ if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
- int divides = (int) Arith.divides(1, curRow - 1, 2);
- curRow = (int) Arith.remainder(curRow, 2);
+ int divides = (int) Arith.divides(1, curRow - 1, 4);
+ curRow = (int) Arith.remainder(curRow, 4);
if (curRow == 0) {
- curRow = 2;
+ curRow = 4;
}
for (int i = 0; i < shelves.group; i ++) {
curRow = shelves.start(curRow);
@@ -136,7 +184,7 @@
crnNo1 = crnNo1 + divides*1;
if (basCrnpService.checkSiteError(crnNo1, true)) {
crnNo = crnNo1;
- curRow = curRow + divides*2;
+ curRow = curRow + divides*4;
break;
}
}
@@ -193,9 +241,13 @@
// 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
+ if (!Cools.isEmpty(shallowLoc)) {
+ if (!shallowLoc.getLocSts().equals("O")) {
+ locMast = null;
+ }
}
+
+
}
}
}
@@ -209,10 +261,10 @@
}
// 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
- if (locTypeDto.getLocType1() == 2) {
- locTypeDto.setLocType1((short) 1);
- return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
- }
+// if (locTypeDto.getLocType1() == 1) {
+// locTypeDto.setLocType1((short) 1);
+// return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+// }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
}
--
Gitblit v1.9.1