From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/controller/MobileController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5c9ae88..67833a3 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
+import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
@@ -63,6 +64,8 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private CanFinMapper canFinMapper;
@Resource
private StaDescService staDescService;
@@ -555,7 +558,8 @@
@PostMapping("/callEmptyBinOutBound")
@ManagerAuth(memo = "pda鍛煎彨绌烘枡妗嗗嚭搴�")
public synchronized R callEmptyBinOutBound(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String size) {
+ , @RequestParam(required = false) String size
+ , @RequestParam(required = false) String agvTaskNo) {
if (Cools.isEmpty(locNo) || Cools.isEmpty(size)) {
return R.error("绔欑偣鎴栬�呭ぇ灏忎笉鑳戒负绌�");
}
@@ -563,7 +567,7 @@
if (wrkMast != null) {
return R.error("璇ョ珯鐐�="+locNo+"宸茬粡鏈夌┖鏉垮嚭搴撲换鍔★紝涓轰簡涓嶅牭濉炲爢鍨涙満鎺ラ┏绔欑偣锛岀姝笅鍙戝涓┖鏉垮嚭搴撲换鍔�");
}
- return mobileService.callEmptyBinOutBound(locNo,size,getUserId());
+ return mobileService.callEmptyBinOutBound(locNo,size,getUserId(), agvTaskNo);
}
/**
@@ -619,7 +623,14 @@
.setAppeTime(date)
.setModiUser(9945L)
.setModiTime(date);
- if (!taskService.insert(task)) {
+ if (taskService.insert(task)) {
+ Date now = new Date();
+ CanFin canFin = new CanFin();
+ canFin.setAgvType("agv-in");
+ canFin.setInNo(TaskNo);
+ canFin.setApplyTime(now);
+ canFinMapper.insert(canFin);
+ }else{
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -652,20 +663,26 @@
@RequestMapping("/orderOut")
public synchronized R AGVOrderOutReturn() {
- List<OrderPakout> settle = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().in("settle", 1, 2).eq("doc_type",11));
+ List<OrderPakout> settle = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().in("settle", 1, 2).eq("doc_type", 11));
List<String> list = new ArrayList<>();
- for (OrderPakout orderPakout: settle) {
- if (orderPakout.getSettle()==2){
- List<OrderDetlPakout> orderId = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderPakout.getId()));
- Boolean boo=true;
- for (OrderDetlPakout orderDetlPakout: orderId) {
- if (orderDetlPakout.getAnfme()>orderDetlPakout.getWorkQty()){
- boo=false;
+
+ // 浣跨敤杩唬鍣ㄩ亶鍘嗭紝鍙互瀹夊叏鍒犻櫎
+ Iterator<OrderPakout> iterator = settle.iterator();
+ while (iterator.hasNext()) {
+ OrderPakout orderPakout = iterator.next();
+
+ if (orderPakout.getSettle() == 2) {
+ List<OrderDetlPakout> orderId = orderDetlPakoutService.selectList(
+ new EntityWrapper<OrderDetlPakout>().eq("order_id", orderPakout.getId()));
+ Boolean boo = true;
+ for (OrderDetlPakout orderDetlPakout : orderId) {
+ if (orderDetlPakout.getAnfme() > orderDetlPakout.getWorkQty()) {
+ boo = false;
break;
}
}
if (boo) {
- settle.remove(orderPakout);
+ iterator.remove(); // 浣跨敤杩唬鍣ㄧ殑remove鏂规硶
}else {
list.add(orderPakout.getOrderNo());
}
--
Gitblit v1.9.1