From a15ad9309f383153d4f5a95a044fb19e882fff55 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 15:19:52 +0800
Subject: [PATCH] 平库组库功能优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
index 912ebe4..a990d36 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
+import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.template.WaitPakinTemplate;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.common.annotation.OperationLog;
@@ -65,7 +66,11 @@
@PostMapping("/waitPakin/save")
public R save(@RequestBody WaitPakin waitPakin) {
try {
- waitPakinService.comb(waitPakin);
+ if (waitPakin.getBarcode().contains("PK")) {
+ waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id);
+ } else {
+ waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id);
+ }
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
@@ -177,7 +182,11 @@
waitPakin.setDetlId(orderDetl.getId());
waitPakin.setMatnr(orderDetl.getMat$().getMatnr());
waitPakin.setBatch(orderDetl.getBatch());
- waitPakinService.comb(waitPakin);
+ if (waitPakinTemplate.getBarcode().contains("PK")) {
+ waitPakinService.comb(waitPakin, OrderType.PK_IN_ORDER.id);
+ } else {
+ waitPakinService.comb(waitPakin, OrderType.UTC_IN_ORDER.id);
+ }
}
return R.ok();
}
--
Gitblit v1.9.1