From e72b21dbb23580bf576ece1550b0e0c041c18ce1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 13 四月 2024 16:51:48 +0800
Subject: [PATCH] 盘点维护库位与货架错乱情况
---
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 3 +
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 5 +
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 136 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 146 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 3d65e5c..7482bec 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -6,6 +6,7 @@
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;
@@ -19,6 +20,7 @@
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;
@@ -185,5 +187,139 @@
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));
+ }
}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index dad9fa8..73d8b03 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -46,4 +46,7 @@
int deleteLocDetl(@Param("locNo")String locNo, @Param("anfme")Double anfme, @Param("matnr")String matnr, @Param("batch")String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
AgvLocDetl selectLocdetl(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
+
+ @Update("update agv_loc_detl set loc_no = '${targetLoc}' where loc_no = '${sourceLoc}' and supp_code = '${containerCode}'")
+ void updateLocNo(String targetLoc, String sourceLoc, String containerCode);
}
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 76dc097..48be52e 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -45,4 +45,6 @@
public void compareToEss(MultipartFile file) throws IOException;
+ public void updateLocNo(String locNo, AgvLocDetl agvLocDetl);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 65121a2..175d9e0 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -252,4 +252,9 @@
}
}
}
+
+ @Override
+ public void updateLocNo(String locNo, AgvLocDetl agvLocDetl) {
+ this.baseMapper.updateLocNo(locNo,agvLocDetl.getLocNo(),agvLocDetl.getSuppCode());
+ }
}
--
Gitblit v1.9.1