From a66b19e1c09201a922735c2325ca04df7fe544af Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:58 +0800
Subject: [PATCH] 空校验;提高代码的健壮性

---
 src/main/java/com/zy/asrs/controller/BasSteErrLogController.java      |    2 
 src/main/java/com/zy/asrs/service/OrderService.java                   |    3 
 src/main/java/com/zy/asrs/controller/ApiLogController.java            |    2 
 src/main/java/com/zy/asrs/controller/BasWhsController.java            |    4 
 src/main/java/com/zy/asrs/controller/LocMastController.java           |    4 
 src/main/webapp/views/apiLog/apiLog.html                              |   10 +
 src/main/java/com/zy/asrs/controller/DocTypeController.java           |    2 
 src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java      |    4 
 src/main/java/com/zy/asrs/controller/AgvBasDevpController.java        |   14 +
 src/main/java/com/zy/asrs/controller/WaitPakinController.java         |    4 
 src/main/java/com/zy/system/controller/ConfigController.java          |   10 
 src/main/java/com/zy/system/controller/RolePdaResourceController.java |    2 
 src/main/java/com/zy/asrs/controller/WaitPakinLogController.java      |    4 
 src/main/java/com/zy/common/web/AuthController.java                   |    6 
 src/main/java/com/zy/asrs/controller/StaDescController.java           |    4 
 src/main/java/com/zy/asrs/controller/AdjDetlController.java           |    4 
 src/main/java/com/zy/asrs/controller/TrayCodeController.java          |    4 
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java        |    3 
 src/main/java/com/zy/asrs/controller/MatController.java               |    4 
 src/main/java/com/zy/system/controller/RoleController.java            |    6 
 src/main/java/com/zy/asrs/controller/BasLocStsController.java         |    6 
 src/main/java/com/zy/asrs/controller/BasSteErrController.java         |    2 
 src/main/java/com/zy/system/controller/UserController.java            |    4 
 src/main/java/com/zy/asrs/controller/BasDevpController.java           |    4 
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java                |    4 
 src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java     |    4 
 src/main/java/com/zy/asrs/controller/BasErrLogController.java         |    4 
 src/main/java/com/zy/asrs/controller/BasSteController.java            |    2 
 src/main/java/com/zy/system/controller/HostController.java            |    6 
 src/main/java/com/zy/system/controller/OperateLogController.java      |    6 
 src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java      |    6 
 src/main/java/com/zy/asrs/controller/BasCrnStatusController.java      |    4 
 src/main/java/com/zy/asrs/controller/NodeController.java              |    4 
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java          |   33 ++++
 src/main/java/com/zy/asrs/controller/AgvMobileController.java         |   62 ++++++--
 src/main/java/com/zy/asrs/controller/WrkLastnoController.java         |    4 
 src/main/java/com/zy/system/controller/ApiController.java             |    6 
 src/main/java/com/zy/asrs/controller/TagController.java               |    2 
 src/main/java/com/zy/asrs/controller/BasSteOptController.java         |    2 
 src/main/java/com/zy/asrs/controller/RowLastnoController.java         |    4 
 src/main/java/com/zy/asrs/controller/MapController.java               |    2 
 src/main/java/com/zy/asrs/controller/AgvLocRuleController.java        |    2 
 src/main/java/com/zy/system/controller/PermissionController.java      |    6 
 src/main/java/com/zy/system/controller/UserLoginController.java       |    6 
 src/main/java/com/zy/system/controller/ResourceController.java        |    4 
 src/main/java/com/zy/asrs/controller/WrkMastLogController.java        |    4 
 src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java        |    2 
 src/main/java/com/zy/asrs/controller/BasWrkStatusController.java      |    6 
 src/main/java/com/zy/asrs/controller/WorkController.java              |    2 
 src/main/java/com/zy/asrs/controller/WrkMastController.java           |    2 
 src/main/java/com/zy/asrs/controller/BasCrnpController.java           |    4 
 src/main/java/com/zy/asrs/controller/OrderSettleController.java       |    2 
 src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java     |    4 
 src/main/java/com/zy/asrs/controller/AppVersionController.java        |    4 
 src/main/java/com/zy/asrs/controller/BasCrnErrorController.java       |    4 
 src/main/java/com/zy/asrs/controller/BasShuttleErrLogController.java  |    2 
 src/main/java/com/zy/asrs/controller/OrderController.java             |    2 
 src/main/java/com/zy/asrs/controller/BasCrnOptController.java         |    4 
 src/main/java/com/zy/asrs/controller/AgvWaitPakinLogController.java   |    4 
 src/main/java/com/zy/asrs/controller/LocDetlController.java           |    8 
 src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java    |    2 
 src/main/java/com/zy/asrs/controller/BasPlcerrorController.java       |    4 
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java      |    9 +
 src/main/java/com/zy/asrs/controller/AgvWrkMastController.java        |    2 
 src/main/java/com/zy/asrs/controller/BasShuttleErrController.java     |    2 
 src/main/java/com/zy/asrs/controller/OrderDetlController.java         |    2 
 src/main/java/com/zy/asrs/controller/PackController.java              |    2 
 src/main/java/com/zy/system/controller/PdaResourceController.java     |    2 
 src/main/java/com/zy/asrs/controller/BasLiftController.java           |    2 
 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java        |    4 
 src/main/java/com/zy/asrs/controller/WrkDetlController.java           |    2 
 src/main/java/com/zy/asrs/controller/AgvLocMastController.java        |    4 
 src/main/java/com/zy/asrs/controller/LocRuleController.java           |    2 
 src/main/java/com/zy/asrs/controller/StkPlcmController.java           |    2 
 src/main/java/com/zy/system/controller/SaasLogController.java         |    2 
 src/main/resources/application.yml                                    |    2 
 76 files changed, 240 insertions(+), 144 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index afc9c24..9a670d9 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -74,7 +74,7 @@
 	@ManagerAuth
     public R update(AdjDetl adjDetl){
         if (Cools.isEmpty(adjDetl) || null==adjDetl.getAdjId()){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         adjDetlService.updateById(adjDetl);
         return R.ok();
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<AdjDetl> list = JSONArray.parseArray(param, AdjDetl.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         for (AdjDetl entity : list){
             adjDetlService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 44c98f3..feba49f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -84,7 +84,7 @@
     @ManagerAuth(memo = "绔欑偣淇敼")
     public R update(AgvBasDevp basDevp){
         if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basDevp.setModiUser(getUserId());
         basDevp.setModiTime(new Date());
@@ -97,7 +97,7 @@
     public R delete(@RequestParam String param){
         List<AgvBasDevp> list = JSONArray.parseArray(param, AgvBasDevp.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvBasDevp entity : list){
             agvBasDevpService.delete(new EntityWrapper<>(entity));
@@ -109,7 +109,9 @@
     @ManagerAuth(memo = "绔欑偣瑙g粦")
     public R unbind(@RequestParam String param){
         AgvBasDevp agvBasDevp = JSONArray.parseObject(param,AgvBasDevp.class);
-
+        if (agvBasDevp==null){
+            return R.error("鍙傛暟缂哄け");
+        }
         //鑻ュ綋鍓嶇珯鐐硅揣浣嶇姸鎬佷笉涓篎.鍦ㄥ簱鐘舵�侊紝鍒欒繑鍥為敊璇�
         if(!agvBasDevp.getLocSts().equals("F")){
             return R.error("褰撳墠绔欑偣璐т綅鐘舵�佷笉涓哄湪搴擄紝鏃犳硶瑙i櫎缁戝畾");
@@ -230,6 +232,9 @@
 
         String barcode = map.get("barcode").toString();
         AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+        if (agvWrkMast == null){
+            R.error("宸ヤ綔妗d笉瀛樺湪");
+        }
         if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
             throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
         }
@@ -250,6 +255,9 @@
 
         String barcode = map.get("barcode").toString();
         AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", barcode).eq("wrk_sts",205L));
+        if (agvWrkMast == null){
+            return R.error("宸ヤ綔妗d笉瀛樺湪");
+        }
         if(agvWrkMast.getIoType() != 101 && agvWrkMast.getIoType() != 110){
             throw new CoolException("宸ヤ綔鍙蜂负" + agvWrkMast.getWrkNo() + "绫诲瀷涓嶄负101.鍑哄簱锛屾棤娉曟墽琛岃揣鏋剁鍦轰换鍔★紝璇烽噸鏂伴�夋嫨绔欑偣銆�");
         }
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 18a266d..505e6a4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -69,7 +69,7 @@
     @Transactional
     public R update(AgvLocMast locMast){
         if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         AgvWrkMast wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                 .eq("source_loc_no", locMast.getLocNo())
@@ -146,7 +146,7 @@
     public R delete(@RequestParam String param){
         List<AgvLocMast> list = JSONArray.parseArray(param, AgvLocMast.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvLocMast entity : list){
             agvLockMastService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocRuleController.java b/src/main/java/com/zy/asrs/controller/AgvLocRuleController.java
index 683c1ee..3e0c129 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocRuleController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocRuleController.java
@@ -96,7 +96,7 @@
 	@ManagerAuth
     public R update(AgvLocRule locRule){
         if (Cools.isEmpty(locRule) || null==locRule.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if ((locRule.getRowEnd() < locRule.getRowBeg()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
             return R.error("鎺掑尯闂撮敊璇�");
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 7f822d2..43ea61c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -12,7 +12,6 @@
 import com.zy.asrs.entity.param.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.service.impl.OrderServiceImpl;
-import com.zy.asrs.utils.OrderUtils;
 import com.zy.common.web.BaseController;
 import lombok.Synchronized;
 import org.slf4j.Logger;
@@ -66,6 +65,9 @@
      */
     @PostMapping("/comb/auth")
     public R comb(@RequestBody CombParam combParam) {
+        if (combParam == null) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         agvMobileService.comb(combParam, getUserId());
 
         return R.ok();
@@ -75,6 +77,9 @@
     @RequestMapping("/pick/again/auth")
     @ManagerAuth(memo = "鍐嶆鎷f枡")
     public R pickAgain(@RequestBody PickParam pickParams) {
+        if (pickParams == null || Cools.isEmpty(pickParams.getLocNo()) || Cools.isEmpty(pickParams.getLocNo())) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         agvMobileService.pickAgain(pickParams, 1l);
         return R.ok("鎷f枡鎴愬姛");
     }
@@ -84,6 +89,9 @@
      */
     @PostMapping("/combBinging/auth")
     public R combBinding(@RequestBody Map<String, Object> map) {
+        if (map == null || Cools.isEmpty(map.get("barcode")) || Cools.isEmpty(map.get("stationCode"))) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         String barcode = map.get("barcode").toString();
         String stationCode = map.get("stationCode").toString();
         Short containerType = Short.valueOf(barcode.substring(0, 2));
@@ -96,6 +104,9 @@
      */
     @PostMapping("/getBasDevp/auth")
     public R getBasDevpByFloor(@RequestBody Map<String, Object> map) {
+        if (map == null || Cools.isEmpty(map.get("floor"))) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         String floor = map.get("floor").toString();
         if ("1".equals(floor) || "3".equals(floor)) {
             return R.ok(agvMobileService.getAgvBasDevpByFloor(Integer.parseInt(floor)));
@@ -117,12 +128,17 @@
     @PostMapping("/pakin/auth")
     @Synchronized
     public R pakin(@RequestBody Map<String, Object> map) {
+        if (map == null || Cools.isEmpty(map.get("devNo"))) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         List<String> devNos = (List<String>) map.get("devNo");
 
         List<AgvBasDevp> agvBasDevpList = devNos.stream().map(devNo -> {
             return agvBasDevpService.selectById(devNo);
         }).collect(Collectors.toList());
-
+        if (agvBasDevpList == null) {
+            return R.error("鏆傚瓨浣嶄笉瀛樺湪");
+        }
         workService.createWaitPainWrkMastStart(agvBasDevpList, getUserId(), false);
 
         return R.ok("鐢熸垚宸ヤ綔妗f垚鍔�");
@@ -136,16 +152,16 @@
     @Transactional
     @ManagerAuth(memo = "鍚姩鍏ュ簱")
     public R startPakin(@RequestBody AgvMobileStartPakin params) {
+        if (params == null) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         log.info("鍚姩鍏ュ簱,{}", JSON.toJSONString(params));
         // 缁勬墭
         params.getCombParams().forEach(combParam -> {
             agvMobileService.comb(combParam, getUserId());
         });
-        //鑾峰彇鍒ゆ柇鏃跺摢涓巶鐨勮鍗�
-        String csocode = params.getCombParams().get(0).getCombMats().get(0).getCsocode();
-        String factory = OrderUtils.getFactory(csocode);
         params.setContainerType(Short.valueOf(params.getContainerCode().substring(0, 2)));
-        workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false,factory);
+        workService.emptyPlateIn(params.getDevNo(), params.getContainerCode(), params.getContainerType(), getUserId(), false);
 
         return R.ok("鐢熸垚宸ヤ綔妗f垚鍔�");
     }
@@ -157,10 +173,12 @@
     @Synchronized
     @ManagerAuth(memo = "绌烘澘鍏ュ簱")
     public R pakinEmpty(@RequestBody AgvMobileStartParam params) {
-
+        if (params == null) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         for (AgvMobileStartParam.Pda pda : params.getPad()) {
             pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
-            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false,null);
+            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
         }
 
         return R.ok();
@@ -173,9 +191,11 @@
     @Synchronized
     @ManagerAuth(memo = "绌烘澘鍑哄簱")
     public R pakoutEmpty(@RequestBody AgvMobileStartParam params) {
-
+        if (params == null) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         for (AgvMobileStartParam.Pda pda : params.getPad()) {
-            if (pda == null) {
+            if (pda == null || Cools.isEmpty(pda.getDevNo()) || Cools.isEmpty(pda.getContainerType())) {
                 return R.error("缂哄皯绔欑偣淇℃伅");
             }
             workService.emptyPlateOut(pda.getDevNo(), pda.getContainerType(), getUserId());
@@ -189,8 +209,13 @@
      */
     @PostMapping("/pakout/empty/container/selector/auth")
     public R containerType(@RequestBody HashMap<String, String> params) {
-
+        if (params == null) {
+            return R.error("缂哄皯鍙傛暟");
+        }
         String devNo = params.get("devNo");
+        if (Cools.isEmpty(devNo)) {
+            return R.error("缂哄皯绔欑偣鏁版嵁");
+        }
         AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
 
         return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
@@ -253,7 +278,9 @@
         String threeCode = params.get("threeCode");
         String matnr = params.get("matnr");
         String floor = params.get("floor");
-
+        if (Cools.isEmpty(matnr)) {
+            return R.error("鍙傛暟缂哄け");
+        }
         Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
 
 
@@ -294,7 +321,9 @@
         String threeCode = params.get("threeCode");
         String matnr = params.get("matnr");
         String floor = params.get("floor");
-
+        if (Cools.isEmpty(orderNo, threeCode, matnr)) {
+            return R.error("鍙傛暟缂哄け");
+        }
         OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("three_code", threeCode).eq("matnr", matnr));
         Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
 
@@ -387,7 +416,9 @@
 
         AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
         AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
-
+        if (agvLocMastByLocNo==null){
+            return R.error("搴撲綅涓嶅瓨鍦�");
+        }
         String barcode1 = agvLocMastByLocNo.getBarcode();
 
 
@@ -510,6 +541,9 @@
             String locNo = map.get("locNo");
             Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
             AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
+            if (agvLocMast == null) {
+                return R.error("搴撲綅涓嶅瓨鍦�");
+            }
             agvLocMast.setLocType(moveType);
             agvLocMast.setLocType3(floor);
             agvLocMastService.update(agvLocMast, wrapper);
diff --git a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
index 787de8b..5be7616 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWaitPakinController.java
@@ -87,7 +87,7 @@
 	@ManagerAuth
     public R update(AgvWaitPakin waitPakin){
         if (Cools.isEmpty(waitPakin)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         agvWaitPakinService.updateById(waitPakin);
         return R.ok();
@@ -99,7 +99,7 @@
     public R delete(@RequestParam String param){
         List<AgvWaitPakin> list = JSONArray.parseArray(param, AgvWaitPakin.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvWaitPakin entity : list){
             AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("barcode", entity.getSuppCode()));
diff --git a/src/main/java/com/zy/asrs/controller/AgvWaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/AgvWaitPakinLogController.java
index bd543eb..12a48b9 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWaitPakinLogController.java
@@ -76,7 +76,7 @@
 	@ManagerAuth
     public R update(AgvWaitPakinLog waitPakinLog){
         if (Cools.isEmpty(waitPakinLog)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         waitPakinLogService.updateById(waitPakinLog);
         return R.ok();
@@ -87,7 +87,7 @@
     public R delete(@RequestParam String param){
         List<AgvWaitPakinLog> list = JSONArray.parseArray(param, AgvWaitPakinLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvWaitPakinLog entity : list){
             waitPakinLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java b/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java
index e9e4e7e..1aa2750 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkDetlController.java
@@ -80,7 +80,7 @@
     public R delete(@RequestParam String param){
         List<AgvWrkDetl> list = JSONArray.parseArray(param, AgvWrkDetl.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvWrkDetl entity : list){
             wrkDetlService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
index 11fca42..7f4568b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkDetlLogController.java
@@ -95,7 +95,7 @@
 	@ManagerAuth
     public R update(AgvWrkDetlLog wrkDetlLog){
         if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getWrkNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         wrkDetlLogService.updateById(wrkDetlLog);
         return R.ok();
@@ -106,7 +106,7 @@
     public R delete(@RequestParam String param){
         List<AgvWrkDetlLog> list = JSONArray.parseArray(param, AgvWrkDetlLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvWrkDetlLog entity : list){
             wrkDetlLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index b6e2b87..72ccede 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -111,7 +111,7 @@
     public R delete(@RequestParam String param){
         List<AgvWrkMast> list = JSONArray.parseArray(param, AgvWrkMast.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("宸ヤ綔妗e弬鏁扮己澶�");
         }
         for (AgvWrkMast entity : list){
             agvWrkMastService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
index bc239c6..f9b185b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastLogController.java
@@ -110,7 +110,7 @@
 	@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗d慨鏀�")
     public R update(AgvWrkMastLog wrkMastLog){
         if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         wrkMastLogService.updateById(wrkMastLog);
         return R.ok();
@@ -121,7 +121,7 @@
     public R delete(@RequestParam String param){
         List<AgvWrkMastLog> list = JSONArray.parseArray(param, AgvWrkMastLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (AgvWrkMastLog entity : list){
             wrkMastLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 36ed259..fe899f3 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -74,7 +74,7 @@
 	@ManagerAuth
     public R update(ApiLog apiLog){
         if (Cools.isEmpty(apiLog) || null==apiLog.getId()){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         apiLogService.updateById(apiLog);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/AppVersionController.java b/src/main/java/com/zy/asrs/controller/AppVersionController.java
index b65b7ae..3787c4c 100644
--- a/src/main/java/com/zy/asrs/controller/AppVersionController.java
+++ b/src/main/java/com/zy/asrs/controller/AppVersionController.java
@@ -66,7 +66,7 @@
         }
         AppVersion latestApp = appVersionService.getLatestApp(type);
         if (latestApp == null) {
-            return R.error();
+            return R.error("鐗堟湰涓嶅瓨鍦�");
         }
 
         if (latestApp.getVersion().equals(version)) {
@@ -104,7 +104,7 @@
     @ManagerAuth
     public R update(AppVersion appVersion){
         if (Cools.isEmpty(appVersion) || null==appVersion.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (appVersion.getLatest() == 1) {
             //淇敼鏈�鏂扮増鏈椂锛岄渶瑕佸皢鍏朵粬鐗堟湰璁剧疆涓洪潪鏈�鏂扮増
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
index f8981e9..3c94b0b 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
@@ -71,7 +71,7 @@
     @ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜淇敼")
     public R update(BasCrnError basCrnError){
         if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         basCrnError.setModiUser(getUserId());
         basCrnError.setModiTime(new Date());
@@ -84,7 +84,7 @@
     public R delete(@RequestParam String param){
         List<BasCrnError> list = JSONArray.parseArray(param, BasCrnError.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         for (BasCrnError entity : list){
             basCrnErrorService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnOptController.java b/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
index dbec856..0b332ac 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
@@ -73,7 +73,7 @@
 	@ManagerAuth
     public R update(BasCrnOpt basCrnOpt){
         if (Cools.isEmpty(basCrnOpt) || null==basCrnOpt.getId()){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         basCrnOptService.updateById(basCrnOpt);
         return R.ok();
@@ -84,7 +84,7 @@
     public R delete(@RequestParam String param){
         List<BasCrnOpt> list = JSONArray.parseArray(param, BasCrnOpt.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         for (BasCrnOpt entity : list){
             basCrnOptService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index d1a65dd..ad00611 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -74,7 +74,7 @@
 	@ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
     public R update(BasCrnStatus basCrnStatus){
         if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         basCrnStatus.setModiUser(getUserId());
         basCrnStatus.setModiTime(new Date());
@@ -87,7 +87,7 @@
     public R delete(@RequestParam String param){
         List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         for (BasCrnStatus entity : list){
             basCrnStatusService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 0c96b39..266210d 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
     public R update(BasCrnp basCrnp){
         if (Cools.isEmpty(basCrnp) || null==basCrnp.getCrnNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basCrnp.setModiUser(getUserId());
         basCrnp.setModiTime(new Date());
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<BasCrnp> list = JSONArray.parseArray(param, BasCrnp.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasCrnp entity : list){
             basCrnpService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index cd89e40..4d9f74f 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth(memo = "绔欑偣淇敼")
     public R update(BasDevp basDevp){
         if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basDevp.setModiUser(getUserId());
         basDevp.setModiTime(new Date());
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("绔欑偣鍙傛暟缂哄け");
         }
         for (BasDevp entity : list){
             basDevpService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasErrLogController.java b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
index 026db32..093f9d5 100644
--- a/src/main/java/com/zy/asrs/controller/BasErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
@@ -75,7 +75,7 @@
 	@ManagerAuth
     public R update(BasErrLog basErrLog){
         if (Cools.isEmpty(basErrLog) || null==basErrLog.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basErrLogService.updateById(basErrLog);
         return R.ok();
@@ -86,7 +86,7 @@
     public R delete(@RequestParam String param){
         List<BasErrLog> list = JSONArray.parseArray(param, BasErrLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasErrLog entity : list){
             basErrLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasLiftController.java b/src/main/java/com/zy/asrs/controller/BasLiftController.java
index 3559e29..e7a8510 100644
--- a/src/main/java/com/zy/asrs/controller/BasLiftController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLiftController.java
@@ -76,7 +76,7 @@
 	@ManagerAuth
     public R update(BasLift basLift){
         if (Cools.isEmpty(basLift) || null==basLift.getLiftNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basLiftService.updateById(basLift);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index 89ea6e5..328e573 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -61,7 +61,7 @@
     @ManagerAuth
     public R edit(BasLocSts basLocSts) {
         if (Cools.isEmpty(basLocSts)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == basLocSts.getLocSts()){
             basLocStsService.insert(basLocSts);
@@ -86,7 +86,7 @@
     @ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�")
     public R update(BasLocSts basLocSts){
         if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basLocSts.setModiUser(getUserId());
         basLocSts.setModiTime(new Date());
@@ -99,7 +99,7 @@
     public R delete(@RequestParam String param){
         List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasLocSts entity : list){
             basLocStsService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
index 5e81cc1..8e54a36 100644
--- a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(BasPlcerror basPlcerror){
         if (Cools.isEmpty(basPlcerror) || null==basPlcerror.getErrorCode()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basPlcerror.setModiUser(getUserId());
         basPlcerror.setModiTime(new Date());
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<BasPlcerror> list = JSONArray.parseArray(param, BasPlcerror.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasPlcerror entity : list){
             basPlcerrorService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleErrController.java b/src/main/java/com/zy/asrs/controller/BasShuttleErrController.java
index 237720e..5c2e32b 100644
--- a/src/main/java/com/zy/asrs/controller/BasShuttleErrController.java
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleErrController.java
@@ -70,7 +70,7 @@
 	@ManagerAuth
     public R update(BasShuttleErr basShuttleErr){
         if (Cools.isEmpty(basShuttleErr) || null==basShuttleErr.getErrorCode()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basShuttleErrService.updateById(basShuttleErr);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleErrLogController.java b/src/main/java/com/zy/asrs/controller/BasShuttleErrLogController.java
index 2c15990..6152702 100644
--- a/src/main/java/com/zy/asrs/controller/BasShuttleErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleErrLogController.java
@@ -70,7 +70,7 @@
 	@ManagerAuth
     public R update(BasShuttleErrLog basShuttleErrLog){
         if (Cools.isEmpty(basShuttleErrLog) || null==basShuttleErrLog.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basShuttleErrLogService.updateById(basShuttleErrLog);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasSteController.java b/src/main/java/com/zy/asrs/controller/BasSteController.java
index 7e342bd..ff35fd2 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(BasSte basSte){
         if (Cools.isEmpty(basSte) || null==basSte.getSteNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basSteService.updateById(basSte);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasSteErrController.java b/src/main/java/com/zy/asrs/controller/BasSteErrController.java
index 14b8689..4f6627e 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteErrController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteErrController.java
@@ -75,7 +75,7 @@
         basSteErr.setModiUser(getUserId());
         basSteErr.setModiTime(new Date());
         if (Cools.isEmpty(basSteErr) || null==basSteErr.getErrorCode()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basSteErrService.updateById(basSteErr);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
index 3bc7482..6b03a50 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(BasSteErrLog basSteErrLog){
         if (Cools.isEmpty(basSteErrLog) || null==basSteErrLog.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basSteErrLogService.updateById(basSteErrLog);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasSteOptController.java b/src/main/java/com/zy/asrs/controller/BasSteOptController.java
index 0003175..b5a46c8 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteOptController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(BasSteOpt basSteOpt){
         if (Cools.isEmpty(basSteOpt) || null==basSteOpt.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basSteOptService.updateById(basSteOpt);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index 2de999b..36d4f79 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -72,7 +72,7 @@
     @ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
     public R update(BasWhs basWhs){
         if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basWhs.setModiUser(getUserId());
         basWhs.setModiTime(new Date());
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasWhs entity : list){
             basWhsService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 359a5e2..e96e6c0 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -61,7 +61,7 @@
     @ManagerAuth
     public R edit(BasWrkIotype basWrkIotype) {
         if (Cools.isEmpty(basWrkIotype)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == basWrkIotype.getIoType()){
             basWrkIotypeService.insert(basWrkIotype);
@@ -86,7 +86,7 @@
     @ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬩慨鏀�")
     public R update(BasWrkIotype basWrkIotype){
         if (Cools.isEmpty(basWrkIotype) || null==basWrkIotype.getIoType()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basWrkIotype.setModiUser(getUserId());
         basWrkIotype.setModiTime(new Date());
@@ -99,7 +99,7 @@
     public R delete(@RequestParam String param){
         List<BasWrkIotype> list = JSONArray.parseArray(param, BasWrkIotype.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasWrkIotype entity : list){
             basWrkIotypeService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index ffb739e..51cb1eb 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -61,7 +61,7 @@
     @ManagerAuth
     public R edit(BasWrkStatus basWrkStatus) {
         if (Cools.isEmpty(basWrkStatus)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == basWrkStatus.getWrkSts()){
             basWrkStatusService.insert(basWrkStatus);
@@ -86,7 +86,7 @@
     @ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
     public R update(BasWrkStatus basWrkStatus){
         if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         basWrkStatus.setModiUser(getUserId());
         basWrkStatus.setModiTime(new Date());
@@ -99,7 +99,7 @@
     public R delete(@RequestParam String param){
         List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (BasWrkStatus entity : list){
             basWrkStatusService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index ee3ff8f..9680ed5 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(DocType docType){
         if (Cools.isEmpty(docType) || null==docType.getDocId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         docType.setUpdateBy(getUserId());
         docType.setUpdateTime(new Date());
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 3ab417a..1a5ff03 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -34,7 +34,7 @@
     @RequestMapping(value = "/locDetl/update")
     public R update1() {
         if (!locDetlService.updateLocNo("0402805", "0402804")) {
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         return R.ok();
     }
@@ -150,7 +150,7 @@
 	@ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
     public R update(LocDetl locDetl){
         if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         locDetl.setModiUser(getUserId());
         locDetl.setModiTime(new Date());
@@ -162,7 +162,7 @@
     @ManagerAuth(memo = "搴撲綅鍐荤粨")
     public R updateStockFreeze(LocDetl locDetl){
         if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         locDetlService.updateStockFreeze(locDetl.getMatnr(), locDetl.getLocNo(), locDetl.getStockFreeze());
         return R.ok();
@@ -173,7 +173,7 @@
     public R delete(@RequestParam String param){
         List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (LocDetl entity : list){
             locDetlService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 8e21d10..ce4a85c 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -104,7 +104,7 @@
     @Transactional
     public R update(LocMast locMast){
         if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
 
         WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
@@ -156,7 +156,7 @@
     public R delete(@RequestParam String param){
         List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (LocMast entity : list){
             locMastService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/LocRuleController.java b/src/main/java/com/zy/asrs/controller/LocRuleController.java
index 4d75e61..a3daed4 100644
--- a/src/main/java/com/zy/asrs/controller/LocRuleController.java
+++ b/src/main/java/com/zy/asrs/controller/LocRuleController.java
@@ -106,7 +106,7 @@
 	@ManagerAuth
     public R update(LocRule locRule){
         if (Cools.isEmpty(locRule) || null==locRule.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if ((locRule.getRowEnd() < locRule.getRowBeg()) || locRule.getRowBeg() <= 0 || locRule.getRowEnd() <= 0) {
             return R.error("鎺掑尯闂撮敊璇�");
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index c3d6517..653bd64 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -208,7 +208,7 @@
     public R resetMap(@PathVariable("lev") Integer lev) {
         Object o = redisUtil.get("realtimeBasMap_" + lev);
         if (o == null) {
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         redisUtil.del("realtimeBasMap_" + lev);
         basMapService.deleteByLev(lev);
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 66fabfa..561c0ed 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -148,7 +148,7 @@
 	@ManagerAuth
     public R update(Mat mat){
         if (Cools.isEmpty(mat) || null==mat.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         mat.setUpdateBy(getUserId());
         mat.setUpdateTime(new Date());
@@ -161,7 +161,7 @@
     public R delete(@RequestParam String param){
         List<Mat> list = JSONArray.parseArray(param, Mat.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (Mat entity : list){
             if (!matService.delete(new EntityWrapper<>(entity))) {
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index ab6619a..24e29ae 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -157,7 +157,7 @@
             throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
         }
         if (Cools.isEmpty(node) || null==node.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (node.getType() != 1) {
             Node parentNode = nodeService.selectById(node.getParentId());
@@ -186,7 +186,7 @@
     public R delete(@RequestParam String param){
         List<Node> list = JSONArray.parseArray(param, Node.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (Node entity : list){
             nodeService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 825752d..8cb8287 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -882,7 +882,7 @@
     @ManagerAuth
     public R update(Order order) {
         if (Cools.isEmpty(order) || null == order.getId()) {
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         order.setUpdateBy(getUserId());
         order.setUpdateTime(new Date());
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 83caf0b..47ca17f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -317,7 +317,7 @@
 	@ManagerAuth
     public R update(OrderDetl orderDetl){
         if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         orderDetlService.updateById(orderDetl);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderSettleController.java b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
index 3c28a47..4518961 100644
--- a/src/main/java/com/zy/asrs/controller/OrderSettleController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
@@ -71,7 +71,7 @@
 	@ManagerAuth
     public R update(OrderSettle orderSettle){
         if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         orderSettle.setUpdateBy(getUserId());
         orderSettle.setUpdateTime(new Date());
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index bcf5865..0a24b3f 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -99,7 +99,7 @@
 	@ManagerAuth
     public R update(Pack pack){
         if (Cools.isEmpty(pack) || null==pack.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         pack.setUpdateBy(getUserId());
         pack.setUpdateTime(new Date());
diff --git a/src/main/java/com/zy/asrs/controller/RowLastnoController.java b/src/main/java/com/zy/asrs/controller/RowLastnoController.java
index b3b2bdb..46c97b5 100644
--- a/src/main/java/com/zy/asrs/controller/RowLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/RowLastnoController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(RowLastno rowLastno){
         if (Cools.isEmpty(rowLastno) || null==rowLastno.getWhsType()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         rowLastno.setModiUser(getUserId());
         rowLastno.setModiTime(new Date());
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<RowLastno> list = JSONArray.parseArray(param, RowLastno.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (RowLastno entity : list){
             rowLastnoService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 8d85caf..dfb8f03 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -80,7 +80,7 @@
 	@ManagerAuth(memo = "绔欑偣璺緞淇敼")
     public R update(StaDesc staDesc){
         if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         staDesc.setModiUser(getUserId());
         staDesc.setModiTime(new Date());
@@ -93,7 +93,7 @@
     public R delete(@RequestParam String param){
         List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (StaDesc entity : list){
             staDescService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/StkPlcmController.java b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
index 4bf0d53..a5957da 100644
--- a/src/main/java/com/zy/asrs/controller/StkPlcmController.java
+++ b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
@@ -70,7 +70,7 @@
     public R delete(@RequestParam String param){
         List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (StkPlcm entity : list){
             stkPlcmService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index 8fd2db1..859a1bd 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -106,7 +106,7 @@
 	@ManagerAuth
     public R update(Tag tag){
         if (Cools.isEmpty(tag) || null==tag.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (tag.getParentId() != null && tag.getParentId() > 0) {
             if (tag.getParentId().equals(tag.getId())) {
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index f70f8c2..84500d8 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth
     public R update(TrayCode trayCode){
         if (Cools.isEmpty(trayCode) || null==trayCode.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         trayCodeService.updateById(trayCode);
         return R.ok();
@@ -83,7 +83,7 @@
     public R delete(@RequestParam String param){
         List<TrayCode> list = JSONArray.parseArray(param, TrayCode.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (TrayCode entity : list){
             trayCodeService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 9898dde..296a54c 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -74,7 +74,7 @@
 	@ManagerAuth
     public R update(WaitPakin waitPakin){
         if (Cools.isEmpty(waitPakin)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         waitPakinService.updateById(waitPakin);
         return R.ok();
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (WaitPakin entity : list){
             waitPakinService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index d0d8bc2..30ac841 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -74,7 +74,7 @@
 	@ManagerAuth
     public R update(WaitPakinLog waitPakinLog){
         if (Cools.isEmpty(waitPakinLog)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         waitPakinLogService.updateById(waitPakinLog);
         return R.ok();
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<WaitPakinLog> list = JSONArray.parseArray(param, WaitPakinLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (WaitPakinLog entity : list){
             waitPakinLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 9870e1c..8032529 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -164,7 +164,7 @@
     @RequestMapping("/deal/steNo/empty")
     @ManagerAuth(memo = "娓呴櫎灏忚溅")
     public R dealSteNoEmpty(@RequestParam Integer wrkNo) {
-        return wrkMastService.setSteEmpty(wrkNo)?R.ok():R.error();
+        return wrkMastService.setSteEmpty(wrkNo)?R.ok():R.error("娓呴櫎澶辫触");
     }
 
 }
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index 3baba43..6834d14 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -78,7 +78,7 @@
     public R delete(@RequestParam String param){
         List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (WrkDetl entity : list){
             wrkDetlService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 517e54d..77a144b 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -93,7 +93,7 @@
 	@ManagerAuth
     public R update(WrkDetlLog wrkDetlLog){
         if (Cools.isEmpty(wrkDetlLog) || null==wrkDetlLog.getWrkNo()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         wrkDetlLogService.updateById(wrkDetlLog);
         return R.ok();
@@ -104,7 +104,7 @@
     public R delete(@RequestParam String param){
         List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (WrkDetlLog entity : list){
             wrkDetlLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
index bd46c69..8c48b6a 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -72,7 +72,7 @@
 	@ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
     public R update(WrkLastno wrkLastno){
         if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         wrkLastno.setModiUser(getUserId());
         wrkLastno.setModiTime(new Date());
@@ -85,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<WrkLastno> list = JSONArray.parseArray(param, WrkLastno.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (WrkLastno entity : list){
             wrkLastnoService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 1d4ff1f..39e1f85 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -174,7 +174,7 @@
     public R delete(@RequestParam String param){
         List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         for (WrkMast entity : list){
             wrkMastService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
index c59c27c..1a0a6fe 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastDetlLogController.java
@@ -102,7 +102,7 @@
     @ManagerAuth
     public R update(WrkMastDetlLog wrkMastDetlLog) {
         if (Cools.isEmpty(wrkMastDetlLog)) {
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         wrkMastDetlLogService.updateById(wrkMastDetlLog);
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 7e0bec4..fc550f8 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -84,7 +84,7 @@
 	@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗d慨鏀�")
     public R update(WrkMastLog wrkMastLog){
         if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
-            return R.error();
+            return R.error("涓嶅瓨鍦ㄥ伐浣滄。");
         }
         wrkMastLogService.updateById(wrkMastLog);
         return R.ok();
@@ -95,7 +95,7 @@
     public R delete(@RequestParam String param){
         List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("鍙傛暟鏈笂浼�");
         }
         for (WrkMastLog entity : list){
             wrkMastLogService.delete(new EntityWrapper<>(entity));
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index f1540a6..722bdf4 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -21,6 +21,8 @@
 
     void checkComplete(String orderNo, Integer pltType);
 
+    void checkComplete2(String orderNo);
+
     boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
 
     void remove(Long orderId);
@@ -29,6 +31,7 @@
 
     List<Order> selectComplete();
 
+
     /**
      * 璁㈠崟鍚堝苟棰勮
      */
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 05605cf..21e2a1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -699,6 +699,9 @@
             throw new CoolException("璇疯緭鍏ヨ揣鏋剁爜");
         }
         AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.getDevNo()));
+        if (agvWrkMast == null) {
+            throw new CoolException("褰撳墠璐ф灦鐮佹病鏈変换鍔�");
+        }
         Integer oldWrkNo = agvWrkMast.getWrkNo();
         if (Cools.isEmpty(agvWrkMast)) {
             throw new CoolException("宸ヤ綔妗d腑娌℃湁姝ょ珯鐐逛换鍔�");
@@ -754,6 +757,9 @@
     public String handBack(AgvMobileStartPakin param, Long userId) {
         Date now = new Date();
         AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.getDevNo()));
+        if (agvWrkMast == null){
+            throw new CoolException("宸ヤ綔妗d腑娌℃湁姝ょ珯鐐逛换鍔�");
+        }
         agvWrkMast.setIoType(113);
         agvWrkMast.setModiUser(userId);
         agvWrkMast.setModiTime(now);
@@ -782,6 +788,9 @@
         agvWrkDetlLogService.save(agvWrkMast.getWrkNo());
         String sourceLocNo = agvWrkMast.getSourceLocNo();
         AgvLocMast newLocMast = agvCommonService.getLocNo(3, 1, false, false);
+        if (newLocMast==null){
+            throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
+        }
         agvWrkMast.setSourceLocNo(agvWrkMast.getLocNo());
         agvWrkMast.setLocNo(newLocMast.getLocNo());
         agvWrkMast.setIoType(57);
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 4b4c04e..2d6e30c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -628,6 +628,9 @@
 
         // 绔欑偣妫�娴�
         AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+        if (Cools.isEmpty(agvBasDevp)) {
+            throw new CoolException("绔欑偣淇℃伅涓嶅瓨鍦�");
+        }
         if (!agvBasDevp.getLocSts().equals("O")) {
             throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜绌烘澘鍑哄簱");
         }
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 9de9ce6..d40aa5c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -146,11 +146,42 @@
                 order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
                 this.baseMapper.updateById(order);
             }
-            //order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+        }
+    }
 
+    @Override
+    public void checkComplete2(String orderNo) {
+        Order order = this.selectByNo(orderNo);
+        if (Cools.isEmpty(order)) {
+            return;
+        }
+        if (order.getSettle() >= 4L) {
+            return;
+        }
+        List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+        // 浣滀笟鏁伴噺鏄惁绛変簬鏁伴噺
+        boolean complete = true;
+        for (OrderDetl orderDetl : orderDetls) {
+            if (orderDetl.getAnfme() > orderDetl.getQty()) {
+                complete = false;
+                break;
+            }
         }
 
+        // 濡傛灉 浣滀笟鏁伴噺绛変簬鍗曟嵁鎬绘暟閲� && 宸ヤ綔鏄庣粏妗d腑鏃犺鍗曟嵁鐨勬暟鎹� && AGV宸ヤ綔鏄庣粏妗d腑鏃犺鍗曟嵁鐨勬暟鎹�
+        int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
+        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;
+        boolean agvWrkDetlExist = agvWrkDetlService.selectCount(new EntityWrapper<AgvWrkDetl>().like("order_no", orderNo)) < 1;
+        boolean waitPakinExist = agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().like("order_no", orderNo)) < 1;
 
+        ManPakOut manPakOut = manPakOutService.selectByOrderWithName(orderNo);
+
+        boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
+        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
+            if (!this.updateSettle(order.getId(), 4L, 9528L)) {
+                throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
+            }
+        }
     }
 
     @Override
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 363bd55..c1b2029 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -102,9 +102,7 @@
     public void completeOrder() {
         List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
         orderList.forEach(order -> {
-            if (order.getPltType() != null) {
-                orderService.checkComplete(order.getOrderNo(), order.getPltType());
-            }
+            orderService.checkComplete2(order.getOrderNo());
         });
     }
 
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index e4d60dc..cbe2ae2 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -438,17 +438,17 @@
             String timeStr = AesUtils.decrypt(activationCode, SystemProperties.SALT);
             if (null == timeStr) {
                 SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
-                return R.error();
+                return R.error("鏈縺娲�");
             }
             Date exprTime = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss);
             if (new Date().getTime() < exprTime.getTime()) {
                 return R.ok().add(DateUtils.convert(exprTime));
             } else {
                 SystemProperties.SYSTEM_ACTIVATION = Boolean.FALSE;
-                return R.error();
+                return R.error("鏈縺娲�");
             }
         } else {
-            return R.error();
+            return R.error("鏈縺娲�");
         }
     }
 
diff --git a/src/main/java/com/zy/system/controller/ApiController.java b/src/main/java/com/zy/system/controller/ApiController.java
index 9c65e8b..d07ae5f 100644
--- a/src/main/java/com/zy/system/controller/ApiController.java
+++ b/src/main/java/com/zy/system/controller/ApiController.java
@@ -58,7 +58,7 @@
     @ManagerAuth
     public R edit(Api api) {
         if (Cools.isEmpty(api)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == api.getId()){
             apiService.insert(api);
@@ -79,7 +79,7 @@
     @ManagerAuth
     public R update(Api api){
         if (Cools.isEmpty(api) || null==api.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         apiService.updateById(api);
         return R.ok();
@@ -89,7 +89,7 @@
     @ManagerAuth
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         apiService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index 69d2e8a..41f2291 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -60,7 +60,7 @@
     @ManagerAuth
     public R edit(Config config) {
         if (Cools.isEmpty(config)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (config.getType() == 2){
             if (!checkJson(config.getValue())){
@@ -92,7 +92,7 @@
     @ManagerAuth
     public R update(Config config){
         if (Cools.isEmpty(config) || null==config.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (config.getType() == 2){
             if (!checkJson(config.getValue())){
@@ -108,7 +108,7 @@
     @ManagerAuth
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         configService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
@@ -152,10 +152,10 @@
             parameter = Parameter.reset();
         } catch (Exception e) {
             e.printStackTrace();
-            return R.error();
+            return R.error("鍒锋柊澶辫触");
         }
         if (Cools.isEmpty(parameter)){
-            return R.error();
+            return R.error("鍒锋柊鍚庝负绌�");
         }
         return R.ok();
     }
diff --git a/src/main/java/com/zy/system/controller/HostController.java b/src/main/java/com/zy/system/controller/HostController.java
index c63ec36..66f821b 100644
--- a/src/main/java/com/zy/system/controller/HostController.java
+++ b/src/main/java/com/zy/system/controller/HostController.java
@@ -58,7 +58,7 @@
     @ManagerAuth
     public R edit(Host host) {
         if (Cools.isEmpty(host)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == host.getId()){
             hostService.insert(host);
@@ -79,7 +79,7 @@
     @ManagerAuth
     public R update(Host host){
         if (Cools.isEmpty(host) || null==host.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         hostService.updateById(host);
         return R.ok();
@@ -89,7 +89,7 @@
     @ManagerAuth
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         hostService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index 5eaedef..18de39a 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -61,7 +61,7 @@
     @ManagerAuth
     public R edit(OperateLog operateLog) {
         if (Cools.isEmpty(operateLog)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == operateLog.getId()){
             operateLogService.insert(operateLog);
@@ -82,7 +82,7 @@
     @ManagerAuth
     public R update(OperateLog operateLog){
         if (Cools.isEmpty(operateLog) || null==operateLog.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         operateLogService.updateById(operateLog);
         return R.ok();
@@ -92,7 +92,7 @@
     @ManagerAuth
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         operateLogService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/PdaResourceController.java b/src/main/java/com/zy/system/controller/PdaResourceController.java
index 25fee84..9158690 100644
--- a/src/main/java/com/zy/system/controller/PdaResourceController.java
+++ b/src/main/java/com/zy/system/controller/PdaResourceController.java
@@ -71,7 +71,7 @@
 	@ManagerAuth
     public R update(PdaResource pdaResource){
         if (Cools.isEmpty(pdaResource) || null==pdaResource.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         pdaResourceService.updateById(pdaResource);
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index e712016..3a9971e 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -58,7 +58,7 @@
     @ManagerAuth
     public R edit(Permission permission) {
         if (Cools.isEmpty(permission)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == permission.getId()){
             permissionService.insert(permission);
@@ -79,7 +79,7 @@
     @ManagerAuth
     public R update(Permission permission){
         if (Cools.isEmpty(permission) || null==permission.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         permissionService.updateById(permission);
         return R.ok();
@@ -89,7 +89,7 @@
     @ManagerAuth
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         permissionService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index b7d3d41..558e53f 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -75,7 +75,7 @@
     @ManagerAuth(memo = "鑿滃崟缂栬緫")
     public R edit(Resource resource) {
         if (Cools.isEmpty(resource)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == resource.getId()){
             if (resource.getSort() == null){
@@ -99,7 +99,7 @@
     @ManagerAuth(memo = "鑿滃崟淇敼")
     public R update(Resource resource){
         if (Cools.isEmpty(resource) || null==resource.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         resourceService.updateById(resource);
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index 9125452..b5187e8 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -78,7 +78,7 @@
     @ManagerAuth(memo = "瑙掕壊缂栬緫")
     public R edit(Role role) {
         if (Cools.isEmpty(role)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == role.getId()){
             roleService.insert(role);
@@ -99,7 +99,7 @@
     @ManagerAuth(memo = "瑙掕壊淇敼")
     public R update(Role role){
         if (Cools.isEmpty(role) || null==role.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         roleService.updateById(role);
         return R.ok();
@@ -109,7 +109,7 @@
     @ManagerAuth(memo = "瑙掕壊鍒犻櫎")
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         roleService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/RolePdaResourceController.java b/src/main/java/com/zy/system/controller/RolePdaResourceController.java
index 2280911..553bbe8 100644
--- a/src/main/java/com/zy/system/controller/RolePdaResourceController.java
+++ b/src/main/java/com/zy/system/controller/RolePdaResourceController.java
@@ -70,7 +70,7 @@
 	@ManagerAuth
     public R update(RolePdaResource rolePdaResource){
         if (Cools.isEmpty(rolePdaResource) || null==rolePdaResource.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         rolePdaResourceService.updateById(rolePdaResource);
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/SaasLogController.java b/src/main/java/com/zy/system/controller/SaasLogController.java
index 95eff11..dca7042 100644
--- a/src/main/java/com/zy/system/controller/SaasLogController.java
+++ b/src/main/java/com/zy/system/controller/SaasLogController.java
@@ -71,7 +71,7 @@
 	@ManagerAuth
     public R update(SaasLog saasLog){
         if (Cools.isEmpty(saasLog) || null==saasLog.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         saasLogService.updateById(saasLog);
         return R.ok();
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 78623cd..c175ac5 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -80,7 +80,7 @@
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
     public R edit(User user) {
         if (Cools.isEmpty(user)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == user.getId()){
             user.setStatus(1);
@@ -105,7 +105,7 @@
     @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
     public R update(User user){
         if (Cools.isEmpty(user) || null==user.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         User entity = userService.selectById(user.getId());
         if (user.getPassword()!=null) {
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 031729f..b09bfc7 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -58,7 +58,7 @@
     @ManagerAuth
     public R edit(UserLogin userLogin) {
         if (Cools.isEmpty(userLogin)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         if (null == userLogin.getId()){
             userLoginService.insert(userLogin);
@@ -79,7 +79,7 @@
     @ManagerAuth
     public R update(UserLogin userLogin){
         if (Cools.isEmpty(userLogin) || null==userLogin.getId()){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         userLoginService.updateById(userLogin);
         return R.ok();
@@ -89,7 +89,7 @@
     @ManagerAuth
     public R delete(Integer[] ids){
         if (Cools.isEmpty(ids)){
-            return R.error();
+            return R.error("鍙傛暟缂哄け");
         }
         userLoginService.deleteBatchIds(Arrays.asList(ids));
         return R.ok();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f2026f2..22524fb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
     #dev loc prod
-    active: prod
\ No newline at end of file
+    active: loc
\ No newline at end of file
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index 84ddf3c..dc68327 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -34,6 +34,16 @@
                     </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
+                            <select name="result">
+                                <option value="">璇烽�夋嫨缁撴灉</option>
+                                <option value="1">鎴愬姛</option>
+                                <option value="0">澶辫触</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
                         </div>
                     </div>

--
Gitblit v1.9.1