From 7b1849b87705bbcedbe6808842c8a2405fa94e60 Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期四, 12 九月 2024 20:05:53 +0800
Subject: [PATCH] 更新
---
src/main/java/com/zy/common/web/AuthController.java | 29 +++-----------
src/main/java/com/zy/common/web/param/SearchLocParam.java | 1
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1
src/main/java/com/zy/asrs/entity/BasDevp.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 21 +++++++---
src/main/java/com/zy/common/web/WcsController.java | 7 ++-
src/main/java/com/zy/common/service/CommonService.java | 4 +
src/main/resources/application.yml | 4 +
8 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 78ca14c..fd5570f 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -81,7 +81,7 @@
@ApiModelProperty(value= "鑳藉嚭")
private String canouting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "婊℃澘")
private String fronting;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index c804b6c..5a06415 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -374,7 +374,7 @@
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setFullPlt(sourceStaNo.getFronting()); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
@@ -418,8 +418,15 @@
throw new CoolException("绔欑偣涓嶅瓨鍦�");
}
for (String locNo : param.getLocNos()) {
- // 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
+ int workNo=9992;
+// if(param.getOutSite()==114||param.getOutSite()==103){
+// // 鑾峰彇宸ヤ綔鍙�
+// workNo = commonService.getWorkNo(WorkNoType.OTHER.type);
+// }else {
+// // 鑾峰彇宸ヤ綔鍙�
+// workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
+// }
+
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
@@ -447,7 +454,7 @@
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
- wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(locMast.getFullPlt()); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
@@ -481,7 +488,7 @@
}
for (String locNo : param.getLocNos()) {
// 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(0);
+// int workNo = commonService.getWorkNo(0);
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
@@ -500,7 +507,7 @@
Date now = new Date();
// 淇濆瓨宸ヤ綔妗�
- wrkMast.setWrkNo(workNo);
+ wrkMast.setWrkNo(9992);
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
@@ -509,7 +516,7 @@
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
- wrkMast.setFullPlt("N"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(locMast.getFullPlt()); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7d518be..f40621f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -70,6 +70,7 @@
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setFullPlt(wrkMast.getFullPlt());
if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 3f5821b..d0c03d5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -172,7 +172,9 @@
int row = Integer.parseInt(loc.getLocNo().substring(0, 2));
String shallowLocNo = "";
- if (row == 1 || row == 2) continue;
+ if (row == 1 || row == 2) {
+ continue;
+ }
LocMast trgerLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + loc.getLocNo().substring(2));
if (!trgerLoc.getLocSts().equals("O")) {
continue;
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 7f178c1..1afa304 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -479,34 +479,19 @@
@ManagerAuth
public R menuPda(@RequestBody HashMap<String,String> params){
Long userId = getUserId();
- String level = params.get("level");
- Long id = Long.valueOf(params.get("id"));
- List<RolePdaResource> rolePdaResources;
+ List<RolePermission> rolePermissions;
if (userId == 9527L) {
- rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<>());
+ rolePermissions = rolePermissionService.selectList(new EntityWrapper<>());
} else {
Long roleId = getUser().getRoleId();
- rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
+ rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
}
- if (Cools.isEmpty(rolePdaResources)) {
+ if (Cools.isEmpty(rolePermissions)) {
return R.ok();
}
- List<Long> collect = rolePdaResources.stream().map(RolePdaResource::getResourceId).distinct().collect(Collectors.toList());
- List<PdaResource> pdaResources = pdaResourceService.selectBatchIds(collect);
- List<PdaResource> results = new ArrayList<>();
-
- for (PdaResource pdaResource : pdaResources) {
- if (Integer.parseInt(level) == 1) {
- if (pdaResource.getLevel().equals(Short.valueOf(level))) {
- results.add(pdaResource);
- }
- } else {
- if (pdaResource.getLevel().equals(Short.valueOf(level)) && pdaResource.getResourceId().equals(id)) {
- results.add(pdaResource);
- }
- }
- }
- return R.ok().add(results);
+ List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
+ List<Permission> permissions = permissionService.selectBatchIds(collect);
+ return R.ok().add(permissions);
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5acf897..787a882 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -99,7 +99,7 @@
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(),param.isFull());
break;
default:
break;
@@ -247,7 +247,7 @@
}
@Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+ public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode,boolean isFull) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
int rowCount = rowLastnoService.selectCount(null);
@@ -275,7 +275,8 @@
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setFullPlt(isFull?"Y":"N"); // 婊℃澘
+//// wrkMast.setFullPlt("N"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
index 1a170ce..2241a6e 100644
--- a/src/main/java/com/zy/common/web/param/SearchLocParam.java
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -16,5 +16,6 @@
// 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:楂樺簱浣嶏級
private Short locType1;
+ private boolean isFull;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bcd0957..5f56a51 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,9 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=flsbasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=flsbasrs
+ url: jdbc:sqlserver://10.10.10.200:1433;databasename=flsbasrs
+
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1