From bd88f87c7a26242017ec7ec1124f76a6f3dae3e0 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 17 二月 2023 09:27:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 376 +++++++++++++++++++++++++++++------------------------
1 files changed, 208 insertions(+), 168 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 2e8c7f3..7450d05 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -92,10 +92,25 @@
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast != null && wrkMast.getIoType() < 100){
+ throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+
+ }
+ if (countLoc > 0 ) {
throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
+
+
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
+
+
Date now = new Date();
@@ -138,16 +153,30 @@
}
// 鍏宠仈缁勬墭
} else {
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ Integer sum = orderDetlService.sameOrderComb(param.getOrderNo(), combMat.getMatnr(),combMat.getBatch());
+ OrderDetl orderDetl = orderDetlService.selectItem(param.getOrderNo(), combMat.getMatnr(), combMat.getBatch());
+ if (orderDetl == null) {
+ throw new CoolException("鎵句笉鍒扮粍鎵樼殑鍗曟嵁鏄庣粏");
+
+ }
+ Double anfme = orderDetl.getAnfme();
+ if ( anfme > (anfme - sum)) {
+ throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
+ }
+ }
Order order = orderService.selectByNo(param.getOrderNo());
if (order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
-
+ for (CombParam.CombMat elem : param.getCombMats()) {
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ if(orderDetl == null){
+ throw new CoolException("璇ュ崟鎹腑涓嶅瓨鍦ㄨ鐗╂枡鏄庣粏锛�" + elem);
+ }
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
@@ -164,7 +193,7 @@
} else {
detlDtos.add(detlDto);
}
- });
+ }
for (DetlDto detlDto : detlDtos) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -191,6 +220,7 @@
}
+ // 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
Date now = new Date();
@@ -211,14 +241,14 @@
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
}
if (Cools.isEmpty(combMat.getBatch())){
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
}
ManLocDetl manLocDetl = new ManLocDetl();
manLocDetl.setLocNo(locno);
manLocDetl.setNodeId(node.getId());
manLocDetl.setMaktx(mat.getMaktx());
manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setBatch(combMat.getBatch());
+ manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
if (!manLocDetlService.insert(manLocDetl)) {
@@ -227,15 +257,25 @@
}
}
+ // 鍟嗗搧涓嬫灦
@Override
public void offSale(OffSaleParam offSaleParam) {
- List<ManLocDetl> manLocDetls = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- if (Cools.isEmpty(manLocDetls)){
- throw new CoolException("鍟嗗搧涓嬫灦澶辫触锛�");
+ ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ if (Cools.isEmpty(manLocDetl)){
+ throw new CoolException("鏃犳鍟嗗搧锛�");
}
- int i = manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- System.out.println(i);
+ double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
+ if (anfme < 0) {
+ throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�");
+ } else if (anfme == 0){
+ manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ }
+ manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId());
}
+
+ // 鏌ユ壘鍟嗗搧
+
+
@Override
@Transactional
public void adjust(MobileAdjustParam param, Long userId) {
@@ -314,162 +354,162 @@
}
- @Override
- @Transactional
- public void packComb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
- // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
- if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
- throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
- }
- Date now = new Date();
-
- boolean packDown = Parameter.get().getPackDown().equals("true");
-
- // 鏃犲崟缁勬墭
- if (Cools.isEmpty(param.getOrderNo())) {
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
- param.getCombMats().forEach(elem -> {
- // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
- if (packDown) {
- Pack pack = packService.selectByBarcode(elem.getMatnr());
- if (pack == null) {
- throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
- }
- if (pack.getSettle() != 1) {
- throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
- }
- }
- Mat analyse = MatUtils.analyseMat(elem.getMatnr());
- // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
- DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
- });
-
- if (packDown) {
- MesCombParam mesCombParam = new MesCombParam();
- mesCombParam.setZpallet(param.getBarcode());
- mesCombParam.setPakinTime(DateUtils.convert(now));
- mesCombParam.setLgort("5008");
- mesCombParam.setPlantCode("5000");
- mesCombParam.setFromCode("5012-20");
- mesCombParam.setStationCode("JJQ-PFZPDB-XX");
- for (DetlDto detlDto : detlDtos) {
- mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PACK_DOWN_URL)
- .setJson(JSON.toJSONString(mesCombParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- } else if (jsonObject.getInteger("code").equals(500)) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException(jsonObject.getString("msg"));
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
- throw new CoolException(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎵撳寘涓嬬嚎甯墭涓婃姤",
- MesConstant.URL + MesConstant.PACK_DOWN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(mesCombParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
-
- }
-
- // 鐢熸垚鍏ュ簱鍗曟嵁
- String orderNo = "PACK" + snowflakeIdWorker.nextId();
- OpenOrderPakinParam openParam = new OpenOrderPakinParam();
- openParam.setOrderNo(orderNo);
- openParam.setOrderTime(DateUtils.convert(now));
- openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
- openParam.setOrderDetails(detlDtos);
- openService.pakinOrderCreate(openParam);
- Order order = orderService.selectByNo(orderNo);
- if (null == order) {
- throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
- }
- if (!orderService.updateSettle(order.getId(), 2L, userId)) {
- throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
- }
-
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- for (DetlDto detlDto : detlDtos) {
-
- // 淇敼浣滀笟鏁伴噺 ----------------------------------------
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
- }
-
- // 淇濆瓨鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
- waitPakin.setOrderNo(orderNo);
- waitPakin.setBatch(detlDto.getBatch());
- waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
- waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
- waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setAppeUser(userId);
- waitPakin.setAppeTime(now);
- waitPakin.setModiUser(userId);
- waitPakin.setModiTime(now);
- if (!waitPakinService.insert(waitPakin)) {
- throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
- }
- // 淇敼鎵撳寘鏁版嵁鐘舵��
- Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
- pack.setSettle(2L);
- pack.setUpdateTime(now);
- pack.setUpdateBy(userId);
- if (!packService.updateById(pack)) {
- throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
- }
- }
-
- }
- }
+// @Override
+// @Transactional
+// public void packComb(CombParam param, Long userId) {
+// if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+// throw new CoolException(BaseRes.PARAM);
+// }
+// // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+// if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+// eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+// throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+// }
+// Date now = new Date();
+//
+// boolean packDown = Parameter.get().getPackDown().equals("true");
+//
+// // 鏃犲崟缁勬墭
+// if (Cools.isEmpty(param.getOrderNo())) {
+//
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// List<DetlDto> detlDtos = new ArrayList<>();
+// param.getCombMats().forEach(elem -> {
+// // 鎵撳寘涓婄嚎鏁版嵁鏍￠獙
+// if (packDown) {
+// Pack pack = packService.selectByBarcode(elem.getMatnr());
+// if (pack == null) {
+// throw new CoolException(elem.getMatnr() + "鏉＄爜鍐椾綑锛岃妫�鏌ワ紒");
+// }
+// if (pack.getSettle() != 1) {
+// throw new CoolException(elem.getMatnr() + "鏉＄爜宸蹭笅绾匡紝璇锋鏌ワ紒");
+// }
+// }
+// Mat analyse = MatUtils.analyseMat(elem.getMatnr());
+// // 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
+//// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+// if (DetlDto.has(detlDtos, detlDto)) {
+// DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+// assert one != null;
+// one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+// } else {
+// detlDtos.add(detlDto);
+// }
+// });
+//
+// if (packDown) {
+// MesCombParam mesCombParam = new MesCombParam();
+// mesCombParam.setZpallet(param.getBarcode());
+// mesCombParam.setPakinTime(DateUtils.convert(now));
+// mesCombParam.setLgort("5008");
+// mesCombParam.setPlantCode("5000");
+// mesCombParam.setFromCode("5012-20");
+// mesCombParam.setStationCode("JJQ-PFZPDB-XX");
+// for (DetlDto detlDto : detlDtos) {
+// mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
+// }
+// String response = "";
+// boolean success = false;
+// try {
+// response = new HttpHandler.Builder()
+// .setUri(MesConstant.URL)
+// .setPath(MesConstant.PACK_DOWN_URL)
+// .setJson(JSON.toJSONString(mesCombParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+// success = true;
+// } else if (jsonObject.getInteger("code").equals(500)) {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+// throw new CoolException(jsonObject.getString("msg"));
+// } else {
+// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
+// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+// }
+// } catch (Exception e) {
+// log.error("fail", e);
+// throw new CoolException(e.getMessage());
+// } finally {
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "鎵撳寘涓嬬嚎甯墭涓婃姤",
+// MesConstant.URL + MesConstant.PACK_DOWN_URL,
+// null,
+// "127.0.0.1",
+// JSON.toJSONString(mesCombParam),
+// response,
+// success
+// );
+// } catch (Exception e) { log.error("", e); }
+// }
+//
+// }
+//
+// // 鐢熸垚鍏ュ簱鍗曟嵁
+// String orderNo = "PACK" + snowflakeIdWorker.nextId();
+// OpenOrderPakinParam openParam = new OpenOrderPakinParam();
+// openParam.setOrderNo(orderNo);
+// openParam.setOrderTime(DateUtils.convert(now));
+// openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
+// openParam.setOrderDetails(detlDtos);
+// openService.pakinOrderCreate(openParam);
+// Order order = orderService.selectByNo(orderNo);
+// if (null == order) {
+// throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
+// }
+// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
+// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+// }
+//
+// // 鐢熸垚鍏ュ簱閫氱煡妗�
+// for (DetlDto detlDto : detlDtos) {
+//
+// // 淇敼浣滀笟鏁伴噺 ----------------------------------------
+// // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
+// if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
+// throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+// }
+// // 淇敼璁㈠崟浣滀笟鏁伴噺
+// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+// }
+//
+// // 淇濆瓨鍏ュ簱閫氱煡妗�
+// Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
+// WaitPakin waitPakin = new WaitPakin();
+// waitPakin.sync(mat);
+// waitPakin.setOrderNo(orderNo);
+// waitPakin.setBatch(detlDto.getBatch());
+// waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+// waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+// waitPakin.setStatus("Y"); // 鐘舵��
+// waitPakin.setAppeUser(userId);
+// waitPakin.setAppeTime(now);
+// waitPakin.setModiUser(userId);
+// waitPakin.setModiTime(now);
+// if (!waitPakinService.insert(waitPakin)) {
+// throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+// }
+// // 淇敼鎵撳寘鏁版嵁鐘舵��
+// Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
+// pack.setSettle(2L);
+// pack.setUpdateTime(now);
+// pack.setUpdateBy(userId);
+// if (!packService.updateById(pack)) {
+// throw new CoolException("淇敼鎵撳寘鏁版嵁寮傚父");
+// }
+// }
+//
+// }
+// }
@Override
@Transactional
--
Gitblit v1.9.1