From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/MobileController.java | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 250 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index cd6085b..5632924 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,28 +1,29 @@
package com.zy.asrs.controller;
+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;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.entity.param.MobileAdjustParam;
-import com.zy.asrs.entity.param.OffSaleParam;
+import com.zy.asrs.entity.param.*;
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;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -30,7 +31,8 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+@Slf4j
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -53,24 +55,135 @@
@Autowired
private PackService packService;
@Autowired
- private ManLocDetlMapper manLocDetlMapper;
+ private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private CommonService commonService;
- // 鍟嗗搧涓婃灦
- @RequestMapping("/mat/onSale/auth")
+// @PostMapping("/agv/start")
+// @ManagerAuth
+// public R pdaStockCheck(@RequestBody StockCheckParam param){
+//
+//
+//
+// }
+
+
+ @PostMapping("/agv/start")
@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("涓嬫灦鎴愬姛");
+ 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")); // 鍏ュ簱绔欑偣
+
+ 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) {
+ List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
+ //璧峰浣�
+ new ForwardAGVTaskParam.PositionCodePaths(agv, "05"),
+ //鐩爣浣�
+ new ForwardAGVTaskParam.PositionCodePaths(sta, "05")
+ );
+ Date date = new Date();
+ DecimalFormat df = new DecimalFormat("0000");
+ 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");
+ agvTaskCreateParam.setCtnrCode("00000000");
+ agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
+ agvTaskCreateParam.setCtnrTyp("1");
+ agvTaskCreateParam.setTaskCode(wrkNo);
+
+ }
+
+ private String forwardAGVHttpRequest(Object requestParam, String url, String path) {
+ String response = "";
+ String success = "error";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url)
+// .setHttps(true)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ String message = jsonObject.get("code").toString();
+ if (("0").equals(message) || ("璇锋眰缂栧彿宸插瓨鍦�").contains(message)) {
+ success = "SUCCESS";
+ } else {
+ success = message;
+ }
+ log.info("杞彂agv浠诲姟锛氳姹備綋:" + JSONObject.toJSONString(requestParam) + ",杩斿洖鍊�:" + jsonObject);
+ } catch (Exception e) {
+
+ }
+ return success;
+ }
+
+ @RequestMapping("/select/workDetl/barcode")
+ @ManagerAuth
+ public R selectWorkDetlBarcode(@RequestBody Map<String, Object> map) {
+ String barcode = map.get("barcode").toString();
+ if (Cools.isEmpty(barcode)) {
+ return R.error("鏉＄爜涓虹┖");
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("鏈壘鍒颁换鍔�");
+ }
+ if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 103) {
+ return R.error("浠诲姟鐘舵�佹湁璇�");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls)) {
+ return R.error("宸ヤ綔鏄庣粏鏈夎");
+ }
+ return R.ok(wrkDetls);
+
+ }
+
+ @RequestMapping("/leftovers/out")
+ @ManagerAuth
+ public R leftoversOut(@RequestBody Map<String, Object> map) {
+ mobileService.leftoversOut(map, getUserId());
+
+
+ return R.ok();
+ }
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -101,36 +214,38 @@
// }
@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)){
+ 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 (Order order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
DocType docType = docTypeService.selectById(order.getDocType());
if (docType.getPakin() == null || docType.getPakin() != 1) {
- return R.ok();
+ continue;
}
if (order.getSettle() > 2) {
- return R.ok();
+ continue;
}
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetl orderDetl : orderDetls) {
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme());
+ combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
+ combMat.setMaktx(orderDetl.getMaktx());
+ combMat.setSpecs(orderDetl.getSpecs());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
@@ -144,14 +259,30 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ 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)
+ .in("wrk_sts", 14, 105));
+ if (Cools.isEmpty(wrkMast)) {
+ mobileService.comb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ } else {
+ mobileService.mergeComb(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
+
+
}
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
- public R packGet(@RequestParam String barcode){
+ public R packGet(@RequestParam String barcode) {
Pack pack = packService.selectByBarcode(barcode);
if (pack == null) {
return R.ok();
@@ -164,7 +295,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
+ public R packComb(@RequestBody CombParam combParam) {
mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -177,7 +308,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();
}
@@ -201,7 +332,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();
}
@@ -215,15 +346,31 @@
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));
+ /**
+ * 鍑哄簱纭 - 鎵揣鐗� 骞垮痉瀹滅鐗�
+ * 1.鍏ㄦ澘 杩斿洖 101
+ * 2.鎷ｆ枡 杩斿洖 103
+ */
+ @RequestMapping("/pakout/confirm/goods/auth") //寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
+ @ManagerAuth
+ 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)) {
+ return R.error("鏈煡鍒版暟鎹�");
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ //澶嶆牳鏁�
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
+ return R.ok();
}
+
/**
* 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
@@ -231,7 +378,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();
}
@@ -366,19 +513,72 @@
@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 = 99999;
+ for (int i = 17; i <= 37; i++) {
+ 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;
+ }
+// locMast.setGro1(w);
+// 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(locMast4);
+ w++;
+ }
+ }
+// for (int i = 17; i <=37; i++) {
+// 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));
+// if (!Cools.isEmpty(locMast)) {
+// locMast.setGro1(w);
+// locMastService.updateById(locMast);
+// }
+//
+// locMast2.setGro1(w);
+// locMast3.setGro1(w);
+//// locMast4.setGro1(w);
+//
+// locMastService.updateById(locMast2);
+// locMastService.updateById(locMast3);
+//// locMastService.updateById(locMast4);
+//// w++;
+// }
+ return R.ok();
+
+ }
+
+
}
--
Gitblit v1.9.1