From 7567c41d009da37e472ecc1ae1de8910ced80d83 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 11:13:46 +0800
Subject: [PATCH] 添加BSCode字段
---
src/main/java/com/zy/asrs/controller/OrderController.java | 4 +-
src/main/java/com/zy/asrs/entity/param/CombParam.java | 1
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 1
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 4 +-
src/main/java/com/zy/common/model/TaskDto.java | 4 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 6 ++
src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 2
src/main/java/com/zy/common/model/LocDto.java | 2 +
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 4 +-
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 ++--
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 3 +
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 2
src/main/java/com/zy/common/model/DetlDto.java | 21 ++++++++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 +++---
17 files changed, 53 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2100762..0fc03de 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -310,13 +310,17 @@
return R.ok().add(combParams);
}
- @RequestMapping("/comb/auth")
+
+
@ManagerAuth(memo = "缁勬墭")
+ @RequestMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
public R packGet(@RequestParam String barcode){
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4c1bd74..96aafaf 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -163,7 +163,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
@@ -220,7 +220,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index fb81d0f..7c107a4 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -155,7 +155,7 @@
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
@@ -213,7 +213,7 @@
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand()
,orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index c941727..01902fb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -186,7 +186,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
@@ -243,7 +243,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index ac07e41..4319c89 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -49,6 +49,7 @@
// 瑙勬牸
private String specs;
+ private String threeCode;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 673903f..5087185 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -35,6 +35,7 @@
private String boxType1 = "1";
private String boxType2 = "1";
private String boxType3 = "1";
+ private String threeCode;
// 鐗╂枡鏁伴噺
private Double anfme;
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 f5b2ed2..eaa2d91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -603,7 +603,7 @@
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -627,6 +627,7 @@
waitPakin.setZpallet(param.getBarcode());
waitPakin.setIoStatus("N");
waitPakin.setAnfme(detlDto.getAnfme());
+ waitPakin.setThreeCode(detlDto.getThreeCode());
waitPakin.setStatus("Y");
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
@@ -669,7 +670,7 @@
OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
detlDto.setOrderId(order.getId());
detlDto.setOrderNo(order.getOrderNo());
if (DetlDto.has(detlDtos, detlDto)) {
@@ -912,7 +913,7 @@
Mat analyse = MatUtils.analyseMat(elem.getMatnr());
// 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), analyse.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
- elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
@@ -1463,7 +1464,6 @@
.eq("area_id", one.getId())
.eq("standby1", supId).orderAsc(Arrays.asList("appe_time")));
//TODO銆� 鍒ゆ柇鏄惁鏈夋柊搴撲綅锛屾病鏈夋柊搴撲綅锛屽啀鎵炬湁绌烘牸鐨勪綅缃斁 1. 鍒ゆ柇褰撳墠鐗╂枡鏄惁鏈夊簱瀛� 2. 娌℃湁浣欐枡鏌ヨ鏂板簱浣�
-
if (!Objects.isNull(detlList) && !detlList.isEmpty()) {
Map<String, List<LocDetl>> locMaps = detlList.stream().collect(Collectors.groupingBy(LocDetl::getLocNo));
locMaps.forEach((locNo, adetls) -> {
@@ -1626,6 +1626,7 @@
.setBatch(pakin.getBatch())
.setMatnr(pakin.getMatnr())
.setMaktx(pakin.getMaktx())
+ .setThreeCode(pakin.getThreeCode())
.setAppeUser(userId)
.setUnit(pakin.getUnit())
.setModel(pakin.getModel())
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 1d40230..2b7dac5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -112,7 +112,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert detlDto != null;
@@ -171,7 +171,7 @@
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -201,7 +201,7 @@
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
- orderDetl.getQty()));
+ orderDetl.getQty(), orderDetl.getThreeCode()));
}
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
@@ -273,7 +273,7 @@
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
if (DetlDto.hasLineNumber(list, dto)) {
DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
@@ -330,7 +330,7 @@
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
@@ -355,7 +355,7 @@
for (OrderDetl orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty(), orderDetl.getThreeCode()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
// if (!orderService.updateSettle(order.getId(), 6L, null)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
index 2437d39..62815ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
@@ -117,7 +117,7 @@
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme(), wrkDetl.getThreeCode()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 592f297..a541308 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -116,7 +116,7 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme(), wrkDetl.getThreeCode()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ba05f58..912bdf6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -117,7 +117,7 @@
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme(), wrkDetl.getThreeCode()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
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 caa1443..9fdf6fd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -148,7 +148,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<DetlDto> detlDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(), elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(), elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme(), elem.getThreeCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(), detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3());
assert detlDto1 != null;
@@ -274,7 +274,7 @@
}
detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),
locDetl.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(),
- locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3(), locDetl.getAnfme()));
+ locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3(), locDetl.getAnfme(), locDetl.getThreeCode()));
locDetl.setOwner(param.getOwnerId());
try {
locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr", locDetl.getMatnr()));
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 06a0624..b71e608 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -37,4 +37,7 @@
}
}
+
+
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 002d171..e8625d6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -97,7 +97,7 @@
for (OrderDetl detail : orderDetls) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme(), detail.getThreeCode());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert detlDto != null;
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index f3e11a4..6369afb 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,7 @@
private String matnr;
+
private String batch = "";
private String brand = "";
private String standby1 = "";
@@ -34,11 +35,12 @@
private String boxType3 = "1";
private Double anfme;
+ private String threeCode;
public DetlDto() {
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -48,9 +50,10 @@
this.boxType1 = boxType1;
this.boxType2 = boxType2;
this.boxType3 = boxType3;
+ this.threeCode = threeCode;
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -61,9 +64,11 @@
this.boxType1 = boxType1;
this.boxType2 = boxType2;
this.boxType3 = boxType3;
+ this.threeCode = threeCode;
+
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -74,9 +79,11 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
- public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.brand = brand;
@@ -88,6 +95,8 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
// public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double anfme) {
@@ -104,7 +113,7 @@
// this.anfme = anfme;
// }
- public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme) {
+ public DetlDto(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3, Double anfme, String threeCode) {
this.orderNo = orderNo;
this.matnr = matnr;
this.batch = batch;
@@ -117,6 +126,8 @@
this.boxType2 = boxType2;
this.boxType3 = boxType3;
this.anfme = anfme;
+ this.threeCode = threeCode;
+
}
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 19410a6..244b9a1 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -32,6 +32,8 @@
private Double anfme;
+ private String threeCode;
+
/**
* 鏄惁鍐荤粨 "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�"
*/
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index a06a373..1da9a02 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -81,7 +81,7 @@
// 姹囨�讳笉鑰冭檻搴忓垪鐮�
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(),locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3(), locDto.getAnfme());
+ DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(),locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3(), locDto.getAnfme(), locDto.getThreeCode());
if (DetlDto.has(detlDtos, dto)) {
DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
assert detlDto != null;
@@ -89,7 +89,7 @@
} else {
detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch()
,locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3()
- , locDto.getAnfme()));
+ , locDto.getAnfme(), locDto.getThreeCode()));
}
}
--
Gitblit v1.9.1