From c2116cdee584c009b7ffb1c89b062e35873b8885 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 17 十月 2024 13:48:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 4 ++--
src/main/java/com/zy/asrs/entity/param/WcsTaskDistributionParam.java | 12 ++++++++++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1abf6c2..0468893 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,9 +51,9 @@
if (Cools.isEmpty(param.getEndSta()) || param.getEndSta$()==0) {
return R.error("缁堢偣[endSta]涓嶈兘涓虹┖");
}
- openService.wcsTaskDistribution(param);
+// openService.wcsTaskDistribution(param);
- return R.ok();
+ return openService.wcsTaskDistribution(param);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/WcsTaskDistributionParam.java b/src/main/java/com/zy/asrs/entity/param/WcsTaskDistributionParam.java
index 49adfe2..601973a 100644
--- a/src/main/java/com/zy/asrs/entity/param/WcsTaskDistributionParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WcsTaskDistributionParam.java
@@ -27,7 +27,11 @@
public Integer getStartSta$(){
if (this.startSta != null){
try{
- return Integer.parseInt(this.startSta);
+ if (STA_ALL.contains(Integer.parseInt(this.startSta))) {
+ return Integer.parseInt(this.startSta);
+ } else {
+ return 0;
+ }
} catch (Exception e){
return 0;
}
@@ -39,7 +43,11 @@
public Integer getEndSta$(){
if (this.endSta != null){
try{
- return Integer.parseInt(this.endSta);
+ if (STA_ALL.contains(Integer.parseInt(this.endSta))) {
+ return Integer.parseInt(this.endSta);
+ } else {
+ return 0;
+ }
} catch (Exception e){
return 0;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 12e0bb0..3a3a1ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -33,9 +33,9 @@
@Override
@Transactional
public R wcsTaskDistribution(WcsTaskDistributionParam param) {
- WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrkNo", param.getTaskNo()));
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()));
if (!Cools.isEmpty(wrkMast1)){
- return R.error().add("宸ヤ綔鍙峰凡瀛樺湪锛宼askNo="+param.getTaskNo());
+ return R.error("宸ヤ綔鍙峰凡瀛樺湪").add("宸ヤ綔鍙峰凡瀛樺湪锛宼askNo="+param.getTaskNo());
}
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(param.getTaskNo());
--
Gitblit v1.9.1