From d763f91da2dee979ac6825569cf61e9f8816d0fe Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十一月 2024 14:32:34 +0800
Subject: [PATCH] Revert "#"
---
src/main/java/com/zy/asrs/controller/MobileController.java | 194 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 186 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 639e1d4..03c10e7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,29 +1,30 @@
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.GDYKConfirmGoodsParam;
-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;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -31,6 +32,7 @@
*/
@RestController
@RequestMapping("mobile")
+@Slf4j
public class MobileController extends BaseController {
@Autowired
@@ -57,7 +59,124 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private CommonService commonService;
+ @PostMapping("/agv/start")
+ @ManagerAuth
+ 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();
+ }
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@@ -150,8 +269,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")
@@ -411,4 +544,49 @@
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));
+// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
+ if (locMast.getGro1() == 999){
+ continue;
+ }
+// locMast.setGro1(w);
+ locMast2.setGro1(locMast.getGro1()+100);
+ locMast3.setGro1(locMast.getGro1()+200);
+// 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", 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 locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
+// locMast.setGro1(w);
+//// locMast2.setGro1(w);
+//// locMast3.setGro1(w);
+//// locMast4.setGro1(w);
+// locMastService.updateById(locMast);
+//// locMastService.updateById(locMast2);
+//// locMastService.updateById(locMast3);
+//// locMastService.updateById(locMast4);
+// w++;
+// }
+ return R.ok();
+
+ }
+
+
+
}
--
Gitblit v1.9.1