From 3bf6f972604761c9ac59a2cb9ea01eeacaec2189 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 15:43:51 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/controller/OutController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index ee83f6d..63f250e 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -12,6 +12,7 @@
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +28,7 @@
*/
@RestController
+@Slf4j
public class OutController extends BaseController {
@Autowired
@@ -245,10 +247,10 @@
locType = 2;
}
String bar = "";
- //鍏蜂綋寰呭畾
-// if(!Cools.isEmpty(orderPakout.getShipCode())&&orderPakout.getShipCode().equals("A01")){
-// bar = "A01";
-// }
+// 鍏蜂綋寰呭畾
+ if(!Cools.isEmpty(orderPakout.getShipCode())){
+ bar = orderPakout.getShipCode();
+ }
LocMast locMast = new LocMast();
if (Cools.isEmpty(bar)) {
locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
@@ -379,16 +381,17 @@
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
- locDto.setBrand(orderDetl.getBrand());
- locDto.setStandby1(orderDetl.getStandby1());
- locDto.setStandby2(orderDetl.getStandby2());
- locDto.setStandby3(orderDetl.getStandby3());
- locDto.setBoxType1(orderDetl.getBoxType1());
- locDto.setBoxType2(orderDetl.getBoxType2());
- locDto.setBoxType3(orderDetl.getBoxType3());
- locDto.setLack(Boolean.TRUE);
- locDtos.add(locDto);
+// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+// locDto.setBrand(orderDetl.getBrand());
+// locDto.setStandby1(orderDetl.getStandby1());
+// locDto.setStandby2(orderDetl.getStandby2());
+// locDto.setStandby3(orderDetl.getStandby3());
+// locDto.setBoxType1(orderDetl.getBoxType1());
+// locDto.setBoxType2(orderDetl.getBoxType2());
+// locDto.setBoxType3(orderDetl.getBoxType3());
+// locDto.setLack(Boolean.TRUE);
+// locDtos.add(locDto);
+ return R.error("搴撳瓨涓嶈冻");
}
}
R pakout = pakout(locDtos);
--
Gitblit v1.9.1