From f3a9f8e0629105203979dce590741941de31ba0e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 七月 2025 18:36:54 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java | 1 -
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java | 4 ++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/LocAreaTypeSts.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 10 ++++------
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
index 7d017c5..8921f91 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -107,7 +107,7 @@
MergePreviewDto dto = new MergePreviewDto();
dtos.add(dto);
- double anfme = waveDetl.getAnfme() - waveDetl.getWorkQty();
+ double anfme = Math.round((waveDetl.getAnfme() - waveDetl.getWorkQty()) * 1000) / 1000.0;
dto.setMatnr(waveDetl.getMatnr());
dto.setBatch(waveDetl.getBatch());
dto.setStatus(0);
@@ -123,7 +123,7 @@
}
@PostMapping("/out/orderOut/merge/wave")
- @OperationLog("娉㈡鍚堝苟璁㈠崟鍑哄簱")
+ @OperationLog("鐢熸垚娉㈡浠诲姟")
@Transactional
public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
outManage.orderOutMergeWave(param);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index 8b5f33c..c6999f5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -35,7 +35,6 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/LocAreaTypeSts.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/LocAreaTypeSts.java
index 66e353c..0032674 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/LocAreaTypeSts.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/LocAreaTypeSts.java
@@ -9,7 +9,7 @@
//鍥涙柟搴�
LOC_AREA_TYPE_ROUND(1L, "鍥涘悜搴�"),
//UTC搴�
- LOC_AREA_TYPE_UTC(4L, "TUC搴�"),
+ LOC_AREA_TYPE_UTC(4L, "CTU搴�"),
//骞冲簱
LOC_AREA_TYPE_FLAT(7L, "骞冲簱")
;
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index b734f6c..26e4738 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -935,9 +935,9 @@
/**
* 娉㈡鍚堝苟鍑哄簱
- * 1. 鍒ゆ柇鏄钩搴撹繕TCU搴�
+ * 1. 鍒ゆ柇鏄钩搴撹繕CTU搴�
* 2. 骞冲簱鐢熸垚鎷ｈ揣鍗�
- * 3. TCU搴撶敓鎴愪换鍔″崟
+ * 3. CTU搴撶敓鎴愪换鍔″崟
*/
outStockByArea(dto, wave);
@@ -1048,13 +1048,11 @@
if (!flatOrders.isEmpty()) {
//骞冲簱鍑哄簱
outStockByFlat(flatOrders, wave);
- } else if (!tucOrders.isEmpty()) {
+ }
+ if (!tucOrders.isEmpty()) {
//CTU鍑哄簱
outStockByTUC(tucOrders, wave);
- } else {
- throw new CoolException("搴撳瓨涓嶈冻");
}
-
}
/**
--
Gitblit v1.9.1