From dda2e4a84cbf54262fd465718b769eb50676977a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 18 十一月 2025 12:39:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 307 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 284 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index caac500..5c53a63 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -87,6 +87,146 @@
@Autowired
private AgvSiteService agvSiteService;
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void AgvStaBind(CombParam param,Long userId) {
+ AgvSite agvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", param.getBarcode()));
+ if (Cools.isEmpty(agvSite)){
+ throw new CoolException("鏈壘鍒癆GV鏆傚瓨浣嶄俊鎭�");
+ }
+ if (agvSite.getStatus() != 0){
+ throw new CoolException("AGV鏆傚瓨浣嶇姸鎬佷笉涓虹┖闂�");
+ }
+
+ int workNo = commonService.getWorkNo(1);
+ Date now = new Date();
+ WrkMast wrkMast1 = new WrkMast();
+ wrkMast1.setWrkNo(workNo);
+ wrkMast1.setWrkSts(2L);
+ wrkMast1.setIoType(300);
+ wrkMast1.setIoTime(now);
+ wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast1.setPicking("N"); // 鎷ｆ枡
+ wrkMast1.setExitMk("N"); // 閫�鍑�
+ wrkMast1.setEmptyMk("N"); // 绌烘澘
+ wrkMast1.setLinkMis("N");
+ wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setBarcode(param.getBarcode());
+ if (!wrkMastService.insert(wrkMast1)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ param.getCombMats().forEach(waitPakin -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+
+ agvSite.setWorkNo(workNo);
+ agvSite.setStatus(1);
+ agvSiteService.updateById(agvSite);
+
+ }
+
+ @Override
+ public R FinishedCall(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ if (orgSite.charAt(0) != 'd'){
+ throw new CoolException("绔欑偣寮傚父锛屽彧鍏佽d寮�澶寸珯鐐�");
+ }
+// 鍛煎彨agv
+ boolean success = sendAgvTask2(orgSite, tarSite,"GT6");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public R agv2fPack(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ if (orgSite.charAt(0) != 'd'){
+ throw new CoolException("绔欑偣寮傚父锛屽彧鍏佽d寮�澶寸珯鐐�");
+ }
+// 鍛煎彨agv
+ boolean success = sendAgvTask2(orgSite, tarSite,"GT5");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public List<ManLocDetl> pingKuGetList(PKInventoryAdjustment combParam) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("鏈壘鍒板钩搴撳簱浣嶄俊鎭�");
+ }
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ manLocDetlEntityWrapper.eq("loc_no", node.getName());
+ manLocDetlEntityWrapper.eq(!Cools.isEmpty(combParam.getMatnr()),"matnr", combParam.getMatnr());
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(manLocDetlEntityWrapper);
+ if (Cools.isEmpty(manLocDetls)){
+ throw new CoolException("鏈壘鍒板簱瀛樹俊鎭�");
+ }
+ return manLocDetls;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void pingKuInventoryAdjustment(PKInventoryAdjustment combParam) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("鏈壘鍒板钩搴撳簱浣嶄俊鎭�");
+ }
+ for (ManLocDetl manLocDetl :combParam.getManLocDetls()){
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ manLocDetlEntityWrapper.eq("loc_no", manLocDetl.getLocNo());
+ manLocDetlEntityWrapper.eq("matnr", manLocDetl.getMatnr());
+ manLocDetlEntityWrapper.eq("batch", manLocDetl.getBatch());
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(manLocDetlEntityWrapper);
+ if (Cools.isEmpty(manLocDetls) || manLocDetls.size() > 1){
+ throw new CoolException("鏁版嵁閿欒");
+ }
+
+ ManLocDetl manLocDetl1 = manLocDetls.get(0);
+ BigDecimal adjustBigDecimal = new BigDecimal(manLocDetl.getAnfme().toString());
+ BigDecimal orgBigDecimal = new BigDecimal(manLocDetl1.getAnfme().toString());
+ if (orgBigDecimal.compareTo(adjustBigDecimal) == 0){
+ continue;
+ }
+ manLocDetl1.setAnfme(adjustBigDecimal.doubleValue());
+ if (!manLocDetlService.update(manLocDetl1,manLocDetlEntityWrapper)){
+ throw new CoolException("鏇存柊鏁版嵁澶辫触");
+ }
+
+
+
+ }
+ }
+
@Override
public R inLocCallAgv(String sta, String inSta) {
@@ -107,6 +247,10 @@
break;
case "3010":
wrapper.in("source_sta_no", "3013", "3014");
+ break;
+ case "1000":
+ case "1035":
+ wrapper.in("source_sta_no", "1024", "1028");
break;
default:
}
@@ -148,8 +292,12 @@
if (jsonObject.getInteger("code").equals(0)) {
success = true;
// 鍏ュ簱鏆傚瓨+1
- basDevp.setInQty(basDevp.getInQty() + 1);
- basDevpMapper.updateById(basDevp);
+ if (!inSta.equals("1000") && !inSta.equals("1035")){
+ basDevp.setInQty(basDevp.getInQty() + 1);
+ basDevpMapper.updateById(basDevp);
+ log.info("鍏ュ簱鍛煎彨锛�"+basDevp.getDevNo()+"+1");
+ }
+
} else {
message = jsonObject.getString("message");
log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
@@ -177,14 +325,14 @@
}
@Override
- public R unbind(String site) {
+ public R unbind2(String site) {
String staMap = AgvSiteConstant.SiteMap.get(site);
if (staMap == null) {
return R.parse("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠锛�" + site);
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("ctnrTyp","3"); // 瀹瑰櫒绫诲瀷2
jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
jsonObject.put("indBind","0"); // 1缁戝畾锛�0瑙ｇ粦
@@ -200,7 +348,7 @@
.build()
.doPost();
JSONObject res = JSON.parseObject(response);
- message = jsonObject.getString("message");
+ message = res.getString("message");
if (res.getInteger("code").equals(0)) {
success = true;
} else {
@@ -227,12 +375,115 @@
return success ? R.ok("瑙ｇ粦鎴愬姛") : R.parse(message);
}
- public boolean sendAgvTask(String org,String tar){
+ @Override
+ public R unbind(String site) {
+ String staMap = AgvSiteConstant.SiteMap.get(site);
+ if (staMap == null) {
+ return R.parse("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠锛�" + site);
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
+ jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
+ jsonObject.put("indBind","0"); // 1缁戝畾锛�0瑙ｇ粦
+
+ String body = jsonObject.toJSONString();
+ String response = "";
+ String message = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(ApiInterfaceConstant.AGV_IP)
+ .setPath(ApiInterfaceConstant.AGV_BIND_PATH)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject res = JSON.parseObject(response);
+ message = res.getString("message");
+ if (res.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("璋冪敤agv瑙ｇ粦鏆傚瓨浣嶅け璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH, body, response);
+ }
+ } catch (Exception e) {
+ log.error("璋冪敤agv瑙ｇ粦鏆傚瓨浣嶅紓甯�", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "璋冪敤agv瑙ｇ粦鏆傚瓨浣�",
+ ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ return success ? R.ok("瑙ｇ粦鎴愬姛") : R.parse(message);
+ }
+
+ public boolean sendAgvTask2(String org,String tar,String type){
ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
forwardAGVTaskParam.setClientCode("IWMS");
- forwardAGVTaskParam.setTaskTyp("GT3");
+ forwardAGVTaskParam.setTaskTyp(type);
+ forwardAGVTaskParam.setCtnrTyp("2");
+ forwardAGVTaskParam.setPriority("1");
+ List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(org, "05"));
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(tar, "04"));
+ forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+ String body = JSON.toJSONString(forwardAGVTaskParam);
+ String response = "";
+ String message = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(ApiInterfaceConstant.AGV_IP)
+ .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+
+ log.error("鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
+ }
+ } catch (Exception e) {
+ log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍏ュ簱鍛煎彨agv",
+ ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ return success;
+ }
+
+ public boolean sendAgvTask(String org,String tar,String type){
+
+ ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+ forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+ forwardAGVTaskParam.setClientCode("IWMS");
+ forwardAGVTaskParam.setTaskTyp(type);
forwardAGVTaskParam.setCtnrTyp("2");
forwardAGVTaskParam.setPriority("1");
List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
@@ -278,8 +529,8 @@
}
return success;
}
-
- private boolean bindPodAndBerth(String sta) {
+ @Override
+ public boolean bindPodAndBerth(String sta) {
String staMap = AgvSiteConstant.SiteMap.get(sta);
if (staMap == null) {
log.error("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠:{}",sta);
@@ -287,7 +538,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("ctnrTyp","3"); // 瀹瑰櫒绫诲瀷2
jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
jsonObject.put("indBind","1"); // 1缁戝畾锛�0瑙ｇ粦
@@ -1280,7 +1531,7 @@
@Override
public R siteList() {
- List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>().eq("status", 1));
+ List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>());
ArrayList<AgvSiteListVo> agvSiteListVos = new ArrayList<>();
for (AgvSite agvSite : agvSites) {
AgvSiteListVo agvSiteListVo = new AgvSiteListVo();
@@ -1309,32 +1560,42 @@
}
AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));
- AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
- if (Cools.isEmpty(orgAgvSite) || Cools.isEmpty(tarAgvSite)) {
+// AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
+ if (Cools.isEmpty(orgAgvSite)) {
return R.error("绔欑偣鏁版嵁閿欒");
}
//鏇存柊tar绔欑偣鐘舵��
- tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
- tarAgvSite.setStatus(2);
- if (!agvSiteService.updateById(tarAgvSite)){
- throw new CoolException("鍙枡绔欐洿鏂板け璐�");
+// tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
+// tarAgvSite.setStatus(2);
+// if (!agvSiteService.updateById(tarAgvSite)){
+// throw new CoolException("鍙枡绔欐洿鏂板け璐�");
+// }
+ WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(5L);
+ wrkMastService.updateById(wrkMast);
}
+
//鏇存柊org绔欑偣鐘舵��
- orgAgvSite.setStatus(2);
+ orgAgvSite.setStatus(0);
+ orgAgvSite.setWorkNo(null);
if (!agvSiteService.updateById(orgAgvSite)){
throw new CoolException("婧愮珯鏇存柊澶辫触");
}
- //鍛煎彨agv
-// boolean success = sendAgvTask(orgSite, tarSite);
-// if (!success){
-// throw new CoolException("鍛煎彨agv澶辫触");
-// }
+
+
+// 鍛煎彨agv
+ boolean success = sendAgvTask(orgSite, tarSite,"GT6");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
return R.ok();
}
+
public void uploadErp(InventoryErpParam param){
String response = "";
boolean success = false;
--
Gitblit v1.9.1