From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MobileController.java | 250 ++++++++++++++++++--------------------------------
1 files changed, 90 insertions(+), 160 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 03c10e7..30df6f5 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,9 +9,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CombParam;
+import com.zy.asrs.entity.param.ForwardAGVTaskParam;
+import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
+import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
-import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.service.CommonService;
@@ -33,7 +35,7 @@
@RestController
@RequestMapping("mobile")
@Slf4j
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -42,9 +44,14 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private OrderService orderService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Autowired
private DocTypeService docTypeService;
@Autowired
@@ -54,33 +61,20 @@
@Autowired
private BasDevpService basDevpService;
@Autowired
- private PackService packService;
- @Autowired
- private ManLocDetlMapper manLocDetlMapper;
- @Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
private CommonService commonService;
+
@PostMapping("/agv/start")
@ManagerAuth
- public R pdaAgvStart(@RequestBody Map<String,Object> map){
+ public R pdaAgvStart(@RequestBody Map<String, Object> map) {
if (Cools.isEmpty(map.get("sta"))) {
return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
} else if (Cools.isEmpty(map.get("inSta"))) {
return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
}
-// 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")); // 鍏ュ簱绔欑偣
@@ -90,7 +84,7 @@
@PostMapping("/agv/unbind")
@ManagerAuth
- public R pdaAgvUnbind(@RequestBody Map<String,Object> map){
+ public R pdaAgvUnbind(@RequestBody Map<String, Object> map) {
String site = (String) map.get("site"); // 鏆傚瓨浣�
@@ -101,16 +95,16 @@
return mobileService.unbind(site);
}
- private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
+ private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam, String agv, String sta) {
List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
//璧峰浣�
- new ForwardAGVTaskParam.PositionCodePaths(agv,"05"),
+ new ForwardAGVTaskParam.PositionCodePaths(agv, "05"),
//鐩爣浣�
- new ForwardAGVTaskParam.PositionCodePaths(sta,"05")
+ new ForwardAGVTaskParam.PositionCodePaths(sta, "05")
);
Date date = new Date();
DecimalFormat df = new DecimalFormat("0000");
- String wrkNo = "Crn"+date.getTime()/1000;
+ String wrkNo = "Crn" + date.getTime() / 1000;
agvTaskCreateParam.setReqCode(wrkNo);
agvTaskCreateParam.setReqTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
agvTaskCreateParam.setTaskTyp("GT1");
@@ -121,7 +115,7 @@
}
- private String forwardAGVHttpRequest(Object requestParam, String url, String path){
+ private String forwardAGVHttpRequest(Object requestParam, String url, String path) {
String response = "";
String success = "error";
try {
@@ -135,13 +129,13 @@
JSONObject jsonObject = JSON.parseObject(response);
String message = jsonObject.get("code").toString();
- if(("0").equals(message) || ("璇锋眰缂栧彿宸插瓨鍦�").contains(message)){
+ if (("0").equals(message) || ("璇锋眰缂栧彿宸插瓨鍦�").contains(message)) {
success = "SUCCESS";
- }else {
+ } else {
success = message;
}
- log.info("杞彂agv浠诲姟锛氳姹備綋:"+JSONObject.toJSONString(requestParam)+",杩斿洖鍊�:"+jsonObject);
- }catch (Exception e){
+ log.info("杞彂agv浠诲姟锛氳姹備綋:" + JSONObject.toJSONString(requestParam) + ",杩斿洖鍊�:" + jsonObject);
+ } catch (Exception e) {
}
return success;
@@ -149,7 +143,7 @@
@RequestMapping("/select/workDetl/barcode")
@ManagerAuth
- public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) {
+ public R selectWorkDetlBarcode(@RequestBody Map<String, Object> map) {
String barcode = map.get("barcode").toString();
if (Cools.isEmpty(barcode)) {
return R.error("鏉＄爜涓虹┖");
@@ -171,70 +165,28 @@
@RequestMapping("/leftovers/out")
@ManagerAuth
- public R leftoversOut(@RequestBody Map<String,Object> map) {
- mobileService.leftoversOut(map,getUserId());
+ public R leftoversOut(@RequestBody Map<String, Object> map) {
+ mobileService.leftoversOut(map, getUserId());
return R.ok();
}
- // 鍟嗗搧涓婃灦
- @RequestMapping("/mat/onSale/auth")
- @ManagerAuth
- public R matOnSale(@RequestBody CombParam combParam){
- mobileService.onSale(combParam);
- return R.ok("涓婃灦鎴愬姛");
- }
- // 鍟嗗搧涓嬫灦
- @RequestMapping("/mat/offSale/auth")
- //@ManagerAuth
- public R matOffSale(@RequestBody OffSaleParam offSaleParam){
- mobileService.offSale(offSaleParam);
- return R.ok("涓嬫灦鎴愬姛");
- }
-
-
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
-
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
- */
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// Order order = orderService.selectByNo(orderNo);
-// if (order == null) {
-// return R.ok();
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// return R.ok();
-// }
-// if (order.getSettle() > 2) {
-// return R.ok();
-// }
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// if (Cools.isEmpty(orderDetls)) {
-// return R.ok();
-// }
-// return R.ok().add(orderDetls);
-// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
- public R orderSearchByBarcode(@RequestParam String orderNo){
- if (Cools.isEmpty(orderNo)){
- orderNo=null;
+ public R orderSearchByBarcode(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
}
- List<Order> orders = orderService.selectorderNoL(orderNo);
- if (Cools.isEmpty(orders)){
+ List<OrderPakin> orders = orderPakinService.selectorderNoL(orderNo);
+ if (Cools.isEmpty(orders)) {
return R.ok();
}
LinkedList<CombParam> combParams = new LinkedList<>();
- if (!Cools.isEmpty(orders)){
- for (Order order:orders){
- CombParam combParam=new CombParam();
+ if (!Cools.isEmpty(orders)) {
+ for (OrderPakin order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -245,16 +197,16 @@
if (order.getSettle() > 2) {
continue;
}
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- if (!Cools.isEmpty(orderDetls)) {
+ List<OrderDetlPakin> orderDetlPakouts = orderPakinService.selectWorkingDetls(order.getId());
+ if (!Cools.isEmpty(orderDetlPakouts)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetlPakin orderDetlPakout : orderDetlPakouts) {
CombParam.CombMat combMat = new CombParam.CombMat();
- combMat.setMatnr(orderDetl.getMatnr());
- combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
- combMat.setMaktx(orderDetl.getMaktx());
- combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setMatnr(orderDetlPakout.getMatnr());
+ combMat.setBatch(orderDetlPakout.getBatch());
+ combMat.setAnfme(orderDetlPakout.getAnfme() - orderDetlPakout.getWorkQty());
+ combMat.setMaktx(orderDetlPakout.getMaktx());
+ combMat.setSpecs(orderDetlPakout.getSpecs());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -268,43 +220,24 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public R comb(@RequestBody CombParam combParam) {
+ log.info("缁勬墭锛�" + JSONObject.toJSONString(combParam));
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));
+ .in("wrk_sts", 14, 105));
if (Cools.isEmpty(wrkMast)) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
- }else {
+ } else {
mobileService.mergeComb(combParam, getUserId());
return R.ok("骞舵澘鎴愬姛");
}
- }
-
- @RequestMapping("/pack/get/auth")
- @ManagerAuth
- public R packGet(@RequestParam String barcode){
- Pack pack = packService.selectByBarcode(barcode);
- if (pack == null) {
- return R.ok();
- }
- if (pack.getSettle() == 1L) {
- return R.ok().add(pack);
- }
- return R.ok("缁勬墭鎴愬姛");
- }
-
- @RequestMapping("/pack/comb/auth")
- @ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
- mobileService.packComb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
}
@@ -315,7 +248,7 @@
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
@RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
return R.ok();
}
@@ -339,7 +272,7 @@
*/
@RequestMapping("/pakout/confirm/barcode/auth")
@ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
+ public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) {
if (Cools.isEmpty(barcode)) {
return R.ok();
}
@@ -360,33 +293,24 @@
*/
@RequestMapping("/pakout/confirm/goods/auth") //寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
@ManagerAuth
- public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
+ public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam) {
if (Cools.isEmpty(combParam)) {
return R.ok();
}
// List<Order> orders = orderService.selectorderNoL(batch);
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
- if (Cools.isEmpty(orderDetl)){
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectOne(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
+ if (Cools.isEmpty(orderDetlPakout)) {
return R.error("鏈煡鍒版暟鎹�");
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ if (!orderDetlPakout.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
//澶嶆牳鏁�
- orderDetl.setSource(1);
- orderDetlService.updateById(orderDetl);
+ orderDetlPakout.setSource(1);
+ orderDetlPakoutService.updateById(orderDetlPakout);
return R.ok();
}
- // 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
- @RequestMapping("/mat/find/auth")
- public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
- //List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
- ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
- return R.ok(manLocDetl);
- //return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
- }
/**
* 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
@@ -394,7 +318,7 @@
@RequestMapping("/pakout/confirm/pick/auth")
@ManagerAuth
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(wrkNo)) {
return R.ok();
}
@@ -529,64 +453,70 @@
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
mobileService.adjust(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
+
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
- if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ if (!param.containsKey("staNo") || !param.containsKey("orderNo")) {
return R.parse(BaseRes.PARAM);
}
- mobileService.pakoutByOrder(param,getUserId());
+ mobileService.pakoutByOrder(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
+
@RequestMapping("/ddd/ddd")
@ManagerAuth()
public R ddd() {
- int w = 64;
+ int w = 99999;
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 = 8; 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));
// 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(locMast.getGro1() + 1000);
+ locMast3.setGro1(locMast.getGro1() + 2000);
// locMast4.setGro1(w);
// locMastService.updateById(locMast);
- locMastService.updateById(locMast2);
- locMastService.updateById(locMast3);
+ locMastService.updateById(locMast2);
+ locMastService.updateById(locMast3);
// locMastService.updateById(locMast4);
- w++;
- }
+ w++;
+ }
}
// for (int i = 17; i <=37; i++) {
-// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
-//// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
-//// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 8).eq("lev1", 1));
+// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 13).eq("lev1", 1));
//// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
-// locMast.setGro1(w);
-//// locMast2.setGro1(w);
-//// locMast3.setGro1(w);
+// if (!Cools.isEmpty(locMast)) {
+// locMast.setGro1(w);
+// locMastService.updateById(locMast);
+// }
+//
+// locMast2.setGro1(w);
+// locMast3.setGro1(w);
//// locMast4.setGro1(w);
-// locMastService.updateById(locMast);
-//// locMastService.updateById(locMast2);
-//// locMastService.updateById(locMast3);
+//
+// locMastService.updateById(locMast2);
+// locMastService.updateById(locMast3);
//// locMastService.updateById(locMast4);
-// w++;
+//// w++;
// }
return R.ok();
}
-
}
--
Gitblit v1.9.1