From 45d602719964509214d06ec5173f23e5307d5dfe Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 12:24:10 +0800
Subject: [PATCH] 无空库位时，不做空板入库操作
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 192 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 188 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 69e0bb0..7482bec 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,18 +1,26 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.AgvLocMast;
+import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +44,8 @@
private AgvLocMastService agvLocMastService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
/*
@@ -43,8 +53,9 @@
*/
@PostMapping("/comb/auth")
public R comb(@RequestBody CombParam combParam){
- String message = agvMobileService.comb(combParam, 1l);
- return R.ok(message);
+ agvMobileService.comb(combParam, getUserId());
+
+ return R.ok();
}
/*
@@ -54,7 +65,7 @@
public R combBinding(@RequestBody Map<String,Object> map){
String barcode = map.get("barcode").toString();
String stationCode = map.get("stationCode").toString();
- Short containerType = Short.valueOf(map.get("containerType").toString());
+ Short containerType = Short.valueOf(barcode.substring(0,2));
agvMobileService.combBinding(barcode,stationCode,containerType);
return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
}
@@ -97,6 +108,23 @@
}
/*
+ 鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+ */
+ @PostMapping("/start/pakin/auth")
+ @Synchronized
+ @Transactional
+ public R startPakin(@RequestBody AgvMobileStartPakin params){
+ // 缁勬墭
+ params.getCombParams().forEach(combParam -> {
+ agvMobileService.comb(combParam,getUserId());
+ });
+ params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+ workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
+
+ return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+ }
+
+ /*
鍏ュ簱
*/
@PostMapping("/pakin/empty/auth")
@@ -105,7 +133,7 @@
for (AgvMobileStartParam.Pda pda : params.getPad()) {
pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
- workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
+ workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
}
return R.ok();
@@ -137,5 +165,161 @@
return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v1")
+ public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
+
+ String orderNo = params.get("orderNo");
+ String threeCode = params.get("threeCode");
+ String matnr = params.get("matnr");
+
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
+
+// wrapper.eq("orderNo",orderNo);
+
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+
+ return R.ok(agvLocDetls);
+ }
+
+ /*
+ 鐩樼偣鎺ュ彛
+ */
+ @PostMapping("/check/detl/v1")
+ public R checkLocDetl(@RequestBody HashMap<String,String> param){
+
+ String locNo = param.get("locNo");
+ String containerCode = param.get("containerCode");
+
+ List<AgvLocDetl> listByLocNo = null;
+ List<AgvLocDetl> listByContainerCode = null;
+
+ if(!Cools.isEmpty(locNo)){
+ listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ }
+ if(!Cools.isEmpty(locNo)){
+ listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
+ }
+
+ Map<String,Object> result = new HashMap<String,Object>();
+ result.put("locNo",listByLocNo);
+ result.put("containerCode",listByContainerCode);
+
+ return R.ok(result);
+
+ }
+
+ /*
+ 鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
+ */
+ @PostMapping("/update/detl/v1")
+ public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
+ String locNo = param.get("locNo");
+ String containerCode = param.get("containerCode");
+
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)){
+ return R.error("鍙傛暟涓嶅叏");
+ }
+
+ List<AgvLocDetl> listByLocNo = null;
+ List<AgvLocDetl> listByContainerCode = null;
+
+ if(!Cools.isEmpty(locNo)){
+ listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
+ }
+ if(!Cools.isEmpty(locNo)){
+ listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
+ }
+
+ AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
+ AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+
+ if(Cools.eq("F",agvLocMastByContainerCode.getLocSts())
+ || Cools.eq("D",agvLocMastByContainerCode.getLocSts())
+ || Cools.eq("F",agvLocMastByLocNo.getLocSts())
+ || Cools.eq("D",agvLocMastByLocNo.getLocSts())){
+
+ return R.error("搴撲綅鐘舵�佷笉涓篎鎴栬�匘锛屾棤娉曠淮鎶�");
+
+ }
+
+ //搴撲綅淇℃伅涓虹┖ 璐ф灦淇℃伅涓嶄负绌�
+ if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
+ //鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
+ listByContainerCode.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(locNo);
+ agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ });
+
+ agvLocMastByLocNo.setLocSts("F");
+ agvLocMastService.updateById(agvLocMastByLocNo);
+
+ if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("D",agvLocMastByContainerCode.getLocSts())){
+ agvLocMastByContainerCode.setLocSts("D");
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+ }
+
+ return R.ok("缁存姢鎴愬姛");
+ }
+
+ //搴撲綅淇℃伅涓嶄负绌� 璐ф灦淇℃伅涓虹┖
+ if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
+ //鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
+ listByLocNo.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
+ agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ });
+
+ agvLocMastByContainerCode.setLocSts("F");
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setLocSts("D");
+ agvLocMastService.updateById(agvLocMastByLocNo);
+
+ return R.ok("缁存姢鎴愬姛");
+ }
+
+ if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
+ return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ }
+
+ listByContainerCode.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
+ agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ });
+
+ listByLocNo.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
+ agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ });
+
+
+ return R.ok("缁存姢鎴愬姛");
+
+ }
+
+ public static void main(String[] args) {
+ List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
+ List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
+
+ AgvLocDetl agvLocDetl1 = new AgvLocDetl();
+ agvLocDetl1.setLocNo("AA");
+ AgvLocDetl agvLocDetl2 = new AgvLocDetl();
+ agvLocDetl2.setLocNo("AA");
+
+ agvLocDetls1.add(agvLocDetl1);
+ agvLocDetls2.add(agvLocDetl2);
+
+ System.out.println(agvLocDetls1.equals(agvLocDetls2));
+
+ List<AgvLocDetl> agvLocDetls22 = null;
+
+ System.out.println(agvLocDetls22.equals(agvLocDetls2));
+ }
}
--
Gitblit v1.9.1