From 62b94e763b07ce64e5b43274bb428c1c9c46ed6e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 25 十二月 2024 13:33:59 +0800
Subject: [PATCH] 出入库限制
---
src/main/java/com/zy/asrs/controller/MobileController.java | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 71de5e5..95568e0 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -26,7 +25,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -64,20 +62,53 @@
@Autowired
private CommonService commonService;
+
+// @PostMapping("/agv/start")
+// @ManagerAuth
+// public R pdaStockCheck(@RequestBody StockCheckParam param){
+//
+//
+//
+// }
+
+
@PostMapping("/agv/start")
@ManagerAuth
public R pdaAgvStart(@RequestBody Map<String,Object> map){
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("agv0001","sta0001");
- String sta = map.get("sta").toString();
- ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
- getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
- String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
- if ("SUCCESS".equals(request)) {
- return R.ok();
+ if (Cools.isEmpty(map.get("sta"))) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ } else if (Cools.isEmpty(map.get("inSta"))) {
+ return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
}
- return R.error();
+// HashMap<String, String> map1 = new HashMap<>();
+// map1.put("agv0001","sta0001");
+// String sta = map.get("sta").toString();
+//
+// ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+// getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
+// String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
+// if ("SUCCESS".equals(request)) {
+// return R.ok();
+// }
+ String sta = (String) map.get("sta"); // 鏆傚瓨浣�
+ String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
+
+ return mobileService.inLocCallAgv(sta, inSta);
+
+ }
+
+ @PostMapping("/agv/unbind")
+ @ManagerAuth
+ public R pdaAgvUnbind(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ return mobileService.unbind(site);
}
private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
@@ -248,8 +279,22 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", combParam.getBarcode())
+ .eq("io_type", 104)
+ .eq("wrk_sts", 14));
+ if (Cools.isEmpty(wrkMast)) {
+ mobileService.comb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }else {
+ mobileService.mergeComb(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
+
+
}
@RequestMapping("/pack/get/auth")
@@ -499,6 +544,13 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/pda/adjust/auth")
+ @ManagerAuth(memo = "pda鐩樼偣")
+ public R pdaAdjust(@RequestBody pdaAdjustParam param){
+ mobileService.pdaAdjust(param,getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -509,22 +561,31 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ @GetMapping("/checkOut/submit/auth")
+ @ManagerAuth(memo = "鐩樼偣涓婁紶")
+ public R CheckOutUploadERP(@RequestParam String orderId){
+ mobileService.inventoryUpload(orderId);
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
+
@RequestMapping("/ddd/ddd")
@ManagerAuth()
public R ddd() {
int w = 64;
for (int i = 17; i <= 37; i++) {
- for (int j = 1;j<=14;j++){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
- LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
+ for (int j = 1;j<=3;j++){
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", j));
+ LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", j));
// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
- if (locMast.getGro1() == 999){
- continue;
- }
+// if (locMast.getGro1() == 999){
+// continue;
+// }
// locMast.setGro1(w);
- locMast2.setGro1(locMast.getGro1()+100);
- locMast3.setGro1(locMast.getGro1()+200);
+// locMast.setGro1(locMast.getGro1()+1000);
+ locMast2.setGro1(locMast2.getGro1()+10000);
+ locMast3.setGro1(locMast3.getGro1()+2000);
// locMast4.setGro1(w);
// locMastService.updateById(locMast);
locMastService.updateById(locMast2);
--
Gitblit v1.9.1