From c3cc244261362fc29db1da839086e7f4478151f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 09 四月 2024 11:14:09 +0800
Subject: [PATCH] 多订单组托
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index cc87a8f..558660f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -42,9 +42,12 @@
locno锛熺粍鎵�+缁戝畾鏆傚瓨浣� 锛� 缁勬墭
*/
@PostMapping("/comb/auth")
- public R comb(@RequestBody CombParam combParam){
- String message = agvMobileService.comb(combParam, 1l);
- return R.ok(message);
+ public R comb(@RequestBody List<CombParam> combParams){
+ combParams.forEach(combParam -> {
+ agvMobileService.comb(combParam, getUserId());
+ });
+
+ return R.ok();
}
/*
@@ -54,7 +57,7 @@
public R combBinding(@RequestBody Map<String,Object> map){
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- Short containerType = Short.valueOf(map.get("containerType").toString());
+ Short containerType = Short.valueOf(barcode.substring(0,2));
agvMobileService.combBinding(barcode,stationCode,containerType);
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
@@ -105,7 +108,7 @@
for (AgvMobileStartParam.Pda pda : params.getPad()) {
pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
+ workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
}
return R.ok();
@@ -131,10 +134,12 @@
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String,String> params){
- Short locType = Short.valueOf(params.get("locType"));
+ String devNo = params.get("devNo");
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- return R.ok(agvLocMastService.queryContainerTypeByLocType1(locType));
+ return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
+
}
--
Gitblit v1.9.1