From 2c945116a7d4dccac387930e40980ae1ba32f05c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 30 三月 2024 16:18:58 +0800
Subject: [PATCH] 物料导入更新 任务完成不解绑站点和容器 组托入库时增加判断是否容器和接驳位已经绑定
---
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 2
src/main/java/com/zy/asrs/entity/Mat.java | 24 ++++++------
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 11 ++++-
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 8 ++--
src/main/java/com/zy/common/entity/MatExcel.java | 4 +-
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 14 +++---
6 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index be0183d..66f5101 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -205,7 +205,7 @@
return R.ok(result);
}
/*
- 瀹瑰櫒绂诲満
+ 浠诲姟瀹屾垚
*/
@RequestMapping(value = "/basDevp/visualized/container/moveOut")
public R visualiZedContainerMoveOut(@RequestBody Map<String,Object> map) {
@@ -247,12 +247,12 @@
agvWrkMastService.updateById(agvWrkMast);
});
//淇敼绔欑偣鐘舵��
- devNos.forEach(devNo -> {
- AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- agvBasDevp.setBarcode("");
- agvBasDevp.setLocSts("O");
- agvBasDevpService.updateById(agvBasDevp);
- });
+// devNos.forEach(devNo -> {
+// AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+// agvBasDevp.setBarcode("");
+// agvBasDevp.setLocSts("O");
+// agvBasDevpService.updateById(agvBasDevp);
+// });
}
} catch (IOException e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index a167280..7ea8f7a 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -58,8 +58,8 @@
/**
* 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鐗╂枡鍙�")
- @ExcelProperty(value = "鐗╂枡鍙�")
+ @ApiModelProperty(value= "瀛樿揣缂栫爜")
+ @ExcelProperty(value = "瀛樿揣缂栫爜")
private String matnr;
@@ -67,14 +67,14 @@
* 鐗╂枡鍙�
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
- @ExcelProperty(value = "鐗╂枡鍚嶇О")
+ @ExcelProperty(value = "瀛樿揣鍚嶇О")
private String maktx;
/**
* 绉诲姩绫诲瀷
*/
- @ApiModelProperty(value= "绉诲姩绫诲瀷")
- //@ExcelProperty(value = "绉诲姩绫诲瀷")
+ @ApiModelProperty(value= "鐢熶骇閮ㄩ棬鍚嶇О")
+ @ExcelProperty(value = "鐢熶骇閮ㄩ棬鍚嶇О")
private String name;
/**
@@ -95,28 +95,28 @@
* 棰滆壊
*/
@ApiModelProperty(value= "棰滆壊")
- @ExcelProperty(value = "鍟嗗搧鍒嗙被鍚嶇О")
+ @ExcelProperty(value = "鏄惁鍐呴攢")
private String color;
/**
* 鍝佺墝
*/
@ApiModelProperty(value= "鍝佺墝")
- @ExcelProperty(value = "鍟嗗搧鍒嗙被缂栫爜")
+ @ExcelProperty(value = "瀛樿揣澶х被鍚嶇О")
private String brand;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- @ExcelProperty(value = "璁￠噺鍗曚綅")
+ @ExcelProperty(value = "涓昏閲忓崟浣嶅悕绉�")
private String unit;
/**
* 鍗曚环
*/
@ApiModelProperty(value= "鍗曚环")
- @ExcelProperty(value = "杩涢」绋�")
+ @ExcelProperty(value = "杩涢」绋庣巼%")
private Double price;
/**
@@ -130,7 +130,7 @@
* 鍖呮暟
*/
@ApiModelProperty(value= "鍖呮暟")
- @ExcelProperty(value = "閿�椤圭◣")
+ @ExcelProperty(value = "閿�椤圭◣鐜�%")
private Double units;
/**
@@ -144,7 +144,7 @@
* 鐗╂枡鐘舵��
*/
@ApiModelProperty(value= "鐗╂枡鐘舵��")
- //@ExcelProperty(value = "鐗╂枡鐘舵��")
+ @ExcelProperty(value = "鏄惁鎵规绠＄悊")
private String origin;
/**
@@ -227,7 +227,7 @@
*/
@ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
- @ExcelProperty(value = "鐗╂枡棰戠巼")
+ //@ExcelProperty(value = "'鏄惁鎵规绠＄悊")
private Integer beBatch;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index b1b53d9..be025c6 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -222,17 +222,22 @@
@Override
public void combBinding(String barcode, String stationCode, Short containerType) {
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", stationCode));
+
+ if(Cools.eq(agvBasDevp.getBarcode(),barcode)){
+ return;
+ }
+
if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(barcode))){
throw new CoolException("璇ユ枡绠辨湭缁勬墭锛屾棤娉曠粦瀹氱珯鐐�");
}
- AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", barcode));
+ AgvBasDevp agvBasDevp1 = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", barcode));
- if(!Cools.isEmpty(agvBasDevp)){
+ if(!Cools.isEmpty(agvBasDevp1)){
throw new CoolException(barcode + "宸茬粡缁戝畾鍦�"+ agvBasDevp.getDevNo() +"绔欑偣");
}
- agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no",stationCode));
if(agvBasDevp == null){
throw new CoolException(stationCode + "绔欑偣淇℃伅閿欒");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 490ab06..f49c996 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -134,7 +134,7 @@
//鍒ゆ柇鏄惁鍏ㄦ澘鍑哄簱
int ioType = isPakOut(sourceLocNo,taskDto) ? 101 : 103;
//鐢熸垚宸ヤ綔妗�
- AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,0);
+ AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
//鐢熸垚宸ヤ綔妗ｆ槑缁�
taskDto.getLocDtos().forEach(locDto -> {
if (!BaseController.isJSON(locDto.getOrderNo())) {
@@ -544,9 +544,9 @@
if (Cools.isEmpty(wrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
- if(!wrkMast.getLocNo().contains("@") || !wrkMast.getSourceLocNo().contains("@")){
- throw new CoolException("鐩爣搴撲綅鎴栬�呮簮搴撲綅鏆傛湭鍒嗛厤锛屾棤娉曞彇娑�");
- }
+// if(!wrkMast.getLocNo().contains("@") || !wrkMast.getSourceLocNo().contains("@")){
+// throw new CoolException("鐩爣搴撲綅鎴栬�呮簮搴撲綅鏆傛湭鍒嗛厤锛屾棤娉曞彇娑�");
+// }
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMastService.updateWrkStsByWrkNo(wrkMast.getWrkNo(),205);
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index e703d2d..525c730 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -56,7 +56,7 @@
}
/*
- 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负206.瀹瑰櫒绂诲満瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
+ 瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负206.鍑哄簱瀹屾垚 涓� (101.鍑哄簱 || 110.绌烘澘鍑哄簱)
*/
@Scheduled(cron = "0/10 * * * * ? ")
public void excuteCarryWrk(){
diff --git a/src/main/java/com/zy/common/entity/MatExcel.java b/src/main/java/com/zy/common/entity/MatExcel.java
index 640c0de..f15fc7d 100644
--- a/src/main/java/com/zy/common/entity/MatExcel.java
+++ b/src/main/java/com/zy/common/entity/MatExcel.java
@@ -14,10 +14,10 @@
@ExcelIgnoreUnannotated
public class MatExcel extends Mat {
- @ExcelProperty(index = 0, value = "涓�绾у垎绫�")
+ @ExcelProperty(value = "涓�绾у垎绫�")
private String priClass;
- @ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
+ @ExcelProperty(value = "瀛樿揣澶х被缂栫爜")
private String secClass;
}
--
Gitblit v1.9.1