From 7b40c5b5b38a56ce3ffdbb467b319d2cd53bab8a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 21 七月 2025 15:35:43 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/third/erp/entity/OutHedTB.java | 4 ++++
src/main/java/com/zy/third/erp/entity/InHedTB.java | 4 ++++
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 1 +
src/main/java/com/zy/asrs/controller/OutController.java | 24 +-----------------------
4 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index f5f52b8..47f0518 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -53,35 +53,13 @@
@PostMapping("/out/pakout/preview/auth")
@ManagerAuth
public R pakoutPreview(@RequestBody List<Long> ids) {
-// if (Cools.isEmpty(ids)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
-// //鐢ㄦ埛纭鍑哄叆搴撻兘浠gno涓哄噯锛岄偅涔堜笉鑰冭檻鏁伴噺浜�
-// List<LocDto> locDtos = new ArrayList<>();
-// if (orderDetls != null && !orderDetls.isEmpty()) {
-// List<LocDetl> locDetls = locDetlService.queryStock(orderDetls.get(0).getSPgNO());
-// for (LocDetl locDetl : locDetls) {
-// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetls.get(0).getOrderNo(),
-// locDetl.getAnfme());
-// List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101);
-// locDto.setStaNos(staNos);
-// locDto.setZpallet(locDetl.getZpallet());
-// locDto.setSPgNO(orderDetls.get(0).getSPgNO());
-// locDtos.add(locDto);
-// }
-// }
-// return R.ok().add(locDtos);
if (Cools.isEmpty(ids)) {
return R.parse(BaseRes.PARAM);
}
List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
List<LocDto> locDtos = new ArrayList<>();
-// orderDetls = orderDetls.stream()
-// .sorted(Comparator.comparing(OrderDetl::getMatnr).thenComparing(OrderDetl::getBatch))
-// .collect(Collectors.toList());
-// Set<String> exist = new HashSet<>();
+
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
diff --git a/src/main/java/com/zy/third/erp/entity/InHedTB.java b/src/main/java/com/zy/third/erp/entity/InHedTB.java
index 88f75dd..109e4c3 100644
--- a/src/main/java/com/zy/third/erp/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InHedTB.java
@@ -78,6 +78,10 @@
@TableField("Temp3")
private String Temp3;
+ @ApiModelProperty(value = "")
+ @TableField("Temp4")
+ private String Temp4;
+
@ApiModelProperty(value = "")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/zy/third/erp/entity/OutHedTB.java b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
index bf935e3..7077b50 100644
--- a/src/main/java/com/zy/third/erp/entity/OutHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
@@ -84,6 +84,10 @@
@TableField("Temp3")
private String Temp3;
+ @ApiModelProperty(value = "")
+ @TableField("Temp4")
+ private String Temp4;
+
@ApiModelProperty(value = "")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index f72f17d..3c9fddd 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -201,6 +201,7 @@
inHedTB.getMakeDate(), // 淇敼鏃堕棿
inHedTB.getRemark() // 澶囨敞
);
+ order.setShipCode(inHedTB.getTemp4());
order.setTemp1(inHedTB.getTemp1());
order.setTemp2(inHedTB.getTemp2());
order.setTemp3(inHedTB.getTemp3());
--
Gitblit v1.9.1