From 364b9ccc44bc6863280c5cc00aa8512cfff548d4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 25 四月 2025 15:27:18 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/entity/CommandInfoLog.java | 2
src/main/java/com/zy/asrs/service/ApiConfigService.java | 2
src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java | 1
src/main/java/com/zy/asrs/mapper/TransferTaskLogMapper.java | 2
src/main/java/com/zy/asrs/service/BasErrLogService.java | 2
src/main/java/com/zy/asrs/utils/VersionUtils.java | 4
src/main/java/com/zy/asrs/entity/ViewStockUseBean.java | 1
src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java | 2
src/main/java/com/zy/asrs/service/TaskWrkLogService.java | 2
src/main/java/com/zy/asrs/controller/MonitorController.java | 1
src/main/java/com/zy/asrs/service/BasDevpService.java | 8 +
src/main/java/com/zy/asrs/entity/ViewInOutBean.java | 1
src/main/java/com/zy/asrs/service/BasCrnOptService.java | 2
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 6
src/main/java/com/zy/asrs/entity/BasErrLog.java | 2
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 2
src/main/java/com/zy/asrs/domain/vo/LocChartPie.java | 1
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 1
src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java | 5
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 9 -
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 1
src/main/java/com/zy/asrs/controller/TransferTaskController.java | 6
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 1
src/main/java/com/zy/asrs/service/TaskWrkService.java | 2
src/main/java/com/zy/core/MainProcess.java | 8
src/main/java/com/zy/asrs/service/ToWmsService.java | 1
src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java | 31 ----
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 6
src/main/java/com/zy/asrs/service/LocDetlService.java | 1
src/main/java/com/zy/asrs/entity/ApiConfig.java | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 242 +++++++++++++++++-----------------
src/main/java/com/zy/asrs/entity/BasCrnOpt.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 1
src/main/java/com/zy/asrs/controller/CrnController.java | 3
src/main/java/com/zy/asrs/service/TransferTaskLogService.java | 2
src/main/java/com/zy/asrs/entity/ApiLog.java | 4
src/main/java/com/zy/asrs/domain/dto/AxisBean.java | 2
src/main/java/com/zy/asrs/entity/TransferTask.java | 2
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3
src/main/java/com/zy/asrs/controller/TransferTaskLogController.java | 2
src/main/java/com/zy/asrs/service/LocMastService.java | 4
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 2
43 files changed, 170 insertions(+), 220 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 2a89e23..067f4a5 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -21,7 +21,6 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.VersionUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -38,7 +37,6 @@
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -53,7 +51,6 @@
@Slf4j
@RestController
public class CrnController {
-
@Autowired
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index eaea9c2..5f8d2d8 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -258,6 +258,7 @@
/**
* x杞村崟浣嶈浆鎹�
+ *
* @param dot y杞存暟鍊间繚鐣欏皬鏁颁綅
*/
private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot) {
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3f21178..a508bdb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,9 +8,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.entity.param.TaskOverParam;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -168,125 +170,6 @@
}
- //鍙栨斁璐х敵璇�
- @PostMapping("/pick/and/place/v1")
- @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
- public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStartPoint())) {
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())) {
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV1(param);
- }
-
- //鍙栨斁璐у畬鎴愬弽棣�
- @PostMapping("/pick/and/place/v2")
- @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
- public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStartPoint())) {
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())) {
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV2(param);
- }
-
-
- private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
- request.setAttribute("cache", obj);
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- if (!APP_KEY_LIST.contains(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- }
-
-
- //浠诲姟涓嬪彂鎺ュ彛
- @PostMapping("/outboundTaskSend")
- @Transactional
- public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
- HashMap<String, Object> map = new HashMap<>();
- for (CarryParam param : params) {
- if (Cools.isEmpty(param)) {
- map.put("Code", "0");
- map.put("Msg", "鍙傛暟涓虹┖锛�");
- return map;
- } else if (Cools.isEmpty(param.getTaskNo())) {
- map.put("Code", "0");
- map.put("Msg", "浠诲姟鍙蜂负绌猴紒");
- return map;
- } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
- map.put("Code", "0");
- map.put("Msg", "浠诲姟绫诲瀷涓虹┖锛�");
- return map;
- }
- String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
- param.setStartPoint(fusion);
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
- if (Cools.isEmpty(locMast)) {
- map.put("Code", "0");
- map.put("Msg", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
- return map;
- }
-
- HashMap<String, Object> r = new HashMap<>();
-
- if (param.getStereoscopicTaskType() == 2) {
- //鍑哄簱浠诲姟鍒涘缓
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", 2)
- .eq("crn_no", locMast.getCrnNo())
- .eq("stn_no", param.getTerminalNo()));
- if (Cools.isEmpty(staDesc)) {
- map.put("Code", "0");
- map.put("Msg", "鍑哄簱璺緞涓嶅瓨鍦紒");
- return map;
- }
- r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
- if (r.get("Code").equals("0")) {
- return r;
- }
- } else if (param.getStereoscopicTaskType() == 3) {
- String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
- param.setTerminalNo(fusion1);
- //绉诲簱浠诲姟鍒涘缓
- r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
- if (r.get("Code").equals("0")) {
- return r;
- }
- }
- apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
- , request.getRemoteAddr() + request.getRequestURI()
- , ""
- , request.getRemoteAddr()
- , JSON.toJSONString(param)
- , r.toString()
- , true
- );
- }
- map.put("Code", "1");
- map.put("Msg", "ok");
- return map;
- }
-
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
@@ -364,6 +247,55 @@
return R.ok(crnStatusParams);
}
+ //鍙栨斁璐х敵璇�
+ @PostMapping("/pick/and/place/v1")
+ @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
+ public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getStartPoint())) {
+ return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())) {
+ return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+ }
+ return openService.getAgvPickAndPlaceV1(param);
+ }
+
+ //鍙栨斁璐у畬鎴愬弽棣�
+ @PostMapping("/pick/and/place/v2")
+ @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
+ public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getStartPoint())) {
+ return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())) {
+ return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+ }
+ return openService.getAgvPickAndPlaceV2(param);
+ }
+
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
//鏌ヨ浠诲姟璇︽儏
@GetMapping("/queryTask")
@@ -394,6 +326,74 @@
}
+ //浠诲姟涓嬪彂鎺ュ彛
+// @PostMapping("/outboundTaskSend")
+// @Transactional
+// public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
+// HashMap<String, Object> map = new HashMap<>();
+// for (CarryParam param : params) {
+// if (Cools.isEmpty(param)) {
+// map.put("Code", "0");
+// map.put("Msg", "鍙傛暟涓虹┖锛�");
+// return map;
+// } else if (Cools.isEmpty(param.getTaskNo())) {
+// map.put("Code", "0");
+// map.put("Msg", "浠诲姟鍙蜂负绌猴紒");
+// return map;
+// } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
+// map.put("Code", "0");
+// map.put("Msg", "浠诲姟绫诲瀷涓虹┖锛�");
+// return map;
+// }
+// String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
+// param.setStartPoint(fusion);
+// LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+// if (Cools.isEmpty(locMast)) {
+// map.put("Code", "0");
+// map.put("Msg", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+// return map;
+// }
+//
+// HashMap<String, Object> r = new HashMap<>();
+//
+// if (param.getStereoscopicTaskType() == 2) {
+// //鍑哄簱浠诲姟鍒涘缓
+// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+// .eq("type_no", 2)
+// .eq("crn_no", locMast.getCrnNo())
+// .eq("stn_no", param.getTerminalNo()));
+// if (Cools.isEmpty(staDesc)) {
+// map.put("Code", "0");
+// map.put("Msg", "鍑哄簱璺緞涓嶅瓨鍦紒");
+// return map;
+// }
+// r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
+// if (r.get("Code").equals("0")) {
+// return r;
+// }
+// } else if (param.getStereoscopicTaskType() == 3) {
+// String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
+// param.setTerminalNo(fusion1);
+// //绉诲簱浠诲姟鍒涘缓
+// r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
+// if (r.get("Code").equals("0")) {
+// return r;
+// }
+// }
+// apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+// , request.getRemoteAddr() + request.getRequestURI()
+// , ""
+// , request.getRemoteAddr()
+// , JSON.toJSONString(param)
+// , r.toString()
+// , true
+// );
+// }
+// map.put("Code", "1");
+// map.put("Msg", "ok");
+// return map;
+// }
+
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
// @PostMapping("/targetWharfApply")
// @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index e4410e0..ca4023a 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -22,6 +22,7 @@
/**
* 鏃ュ織缁熻鎺у埗鍣ㄥ眰
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
@@ -158,6 +159,7 @@
/**
* 鏃ュ叆搴撴眹鎬绘煡璇�
+ *
* @return
*/
@RequestMapping("/viewWorkCountInList.action")
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 1e807e6..9b925e5 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,17 +9,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.TaskWrkLog;
-import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
-import com.zy.asrs.service.TaskWrkReportService;
import com.zy.asrs.service.ToWmsService;
-import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
diff --git a/src/main/java/com/zy/asrs/controller/TransferTaskController.java b/src/main/java/com/zy/asrs/controller/TransferTaskController.java
index 0f7ad8d..2a656ff 100644
--- a/src/main/java/com/zy/asrs/controller/TransferTaskController.java
+++ b/src/main/java/com/zy/asrs/controller/TransferTaskController.java
@@ -20,7 +20,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@RestController
@Slf4j
@@ -38,7 +40,6 @@
@Autowired
private ToWmsService toWmsService;
-
@RequestMapping(value = "/transferTask/{wrkNo}/auth")
@ManagerAuth
@@ -129,7 +130,6 @@
List<TaskWrk> list = taskWrkService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
-
@RequestMapping(value = "/transferTask/check/column/auth")
diff --git a/src/main/java/com/zy/asrs/controller/TransferTaskLogController.java b/src/main/java/com/zy/asrs/controller/TransferTaskLogController.java
index 212efb7..f19826f 100644
--- a/src/main/java/com/zy/asrs/controller/TransferTaskLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TransferTaskLogController.java
@@ -40,7 +40,6 @@
@Autowired
private ToWmsService toWmsService;
-
@RequestMapping(value = "/transferTaskLog/{wrkNo}/auth")
@ManagerAuth
@@ -131,7 +130,6 @@
List<TaskWrk> list = taskWrkService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
-
@RequestMapping(value = "/transferTaskLog/check/column/auth")
diff --git a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java b/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
index 6a7bbbe..2eb2866 100644
--- a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
+++ b/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
@@ -2,8 +2,8 @@
/**
* 鏇茬嚎鍥捐〃json閿�
- * @author admin
*
+ * @author admin
*/
public class AxisBean {
private String name;
diff --git a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
index 0d0d9b9..755c2fc 100644
--- a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
+++ b/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
@@ -2,6 +2,7 @@
/**
* 鍏ュ嚭搴撶粺璁℃洸绾垮浘
+ *
* @author admin
* @date 2018骞�12鏈�12鏃�
*/
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
index 339ed51..0295baa 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
+++ b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
@@ -2,6 +2,7 @@
/**
* 搴撲綅鍗犵敤鐧惧垎姣�
+ *
* @author admin
* @date 2018骞�12鏈�12鏃�
*/
diff --git a/src/main/java/com/zy/asrs/entity/ApiConfig.java b/src/main/java/com/zy/asrs/entity/ApiConfig.java
index 66828ba..84f0709 100644
--- a/src/main/java/com/zy/asrs/entity/ApiConfig.java
+++ b/src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -33,7 +33,7 @@
private String url;
/**
- * 鐘舵�� 0: 姝ｅ父 1: 绂佺敤
+ * 鐘舵�� 0: 姝ｅ父 1: 绂佺敤
*/
@ApiModelProperty(value = "鐘舵�� 0: 姝ｅ父 1: 绂佺敤 ")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index cbdf787..c30fa7d 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -82,13 +82,13 @@
private String err;
/**
- * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
*/
@ApiModelProperty(value = "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
private Integer result;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
index 9865967..fd106e7 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -110,7 +110,7 @@
private Integer posSta;
/**
- * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
+ * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
*/
@ApiModelProperty(value = "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
private Integer response;
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index bd2c0b6..3e6aadf 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -129,7 +129,7 @@
private String error;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
@ApiModelProperty(value = "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
index b7c8bb2..b4bb1b9 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
@@ -120,7 +120,7 @@
private String err;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
@ApiModelProperty(value = "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index 275cee1..2306da4 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
@@ -46,7 +46,7 @@
private String endPos;
/**
- * 鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚
+ * 鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚
*/
@ApiModelProperty(value = "鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚 ")
@TableField("command_status")
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index b615ae3..5aabe2f 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -30,7 +30,7 @@
private String taskNo;
/**
- * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
+ * 浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷
*/
@ApiModelProperty(value = "浠诲姟鐘舵�� 1: 鎺ユ敹 2: 娲惧彂 3: 瀹岀粨 4: 鍙栨秷 ")
private Integer status;
diff --git a/src/main/java/com/zy/asrs/entity/TransferTask.java b/src/main/java/com/zy/asrs/entity/TransferTask.java
index d6b514a..5e79240 100644
--- a/src/main/java/com/zy/asrs/entity/TransferTask.java
+++ b/src/main/java/com/zy/asrs/entity/TransferTask.java
@@ -122,6 +122,4 @@
private Date cancelTime;
-
-
}
diff --git a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
index 01f8560..111ce43 100644
--- a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
@@ -2,6 +2,7 @@
/**
* 鏃ュ嚭鍏ュ簱娆℃暟缁熻
+ *
* @author admin
* @date 2018骞�11鏈�24鏃�
*/
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index e4eec23..86887a5 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -13,6 +13,7 @@
/**
* 搴撳瓨婊炵暀鏃堕棿瀹炰綋绫�
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
diff --git a/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java b/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
index a1c4c93..888cd33 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
@@ -2,6 +2,7 @@
/**
* 搴撲綅浣跨敤鐜囪鍥惧疄浣撶被
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 8f87995..c8f62fb 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -13,6 +13,7 @@
/**
* 鍏ュ簱鏄庣粏缁熻
+ *
* @author admin
* @date 2018骞�11鏈�26鏃�
*/
diff --git a/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java b/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java
index 2b8c587..ec883ae 100644
--- a/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java
@@ -2,17 +2,12 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.DevpTask;
-import com.zy.asrs.entity.TaskWrk;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
-
-import java.util.List;
@Mapper
@Repository
public interface DevpTaskMapper extends BaseMapper<DevpTask> {
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 75ce6ea..b263c53 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -40,5 +40,4 @@
List<LocMast> selectLocByLev(@Param("lev") Integer lev);
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/TransferTaskLogMapper.java b/src/main/java/com/zy/asrs/mapper/TransferTaskLogMapper.java
index 269dcd5..965c81a 100644
--- a/src/main/java/com/zy/asrs/mapper/TransferTaskLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TransferTaskLogMapper.java
@@ -1,7 +1,6 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.TransferTask;
import com.zy.asrs.entity.TransferTaskLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -9,7 +8,6 @@
@Mapper
@Repository
public interface TransferTaskLogMapper extends BaseMapper<TransferTaskLog> {
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index daaa6bd..d4a434b 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -81,6 +81,7 @@
/**
* 鍫嗗灈鏈烘槸鍚﹀瓨鍦ㄥ嚭搴撲换鍔�
+ *
* @param crnNo
* @return
*/
@@ -88,6 +89,7 @@
/**
* 杈撻�佺嚎鏄惁瀛樺湪鍏ュ簱浠诲姟
+ *
* @param crnNo
* @return
*/
@@ -98,6 +100,7 @@
/**
* 鏌ユ壘鍫嗗灈鏈哄彿瀵瑰簲鎵�鏈夊緟鍑哄簱宸ヤ綔妗�
+ *
* @param crnNO
* @param sourceStaNo
* @return
diff --git a/src/main/java/com/zy/asrs/service/ApiConfigService.java b/src/main/java/com/zy/asrs/service/ApiConfigService.java
index fc269ff..18948f4 100644
--- a/src/main/java/com/zy/asrs/service/ApiConfigService.java
+++ b/src/main/java/com/zy/asrs/service/ApiConfigService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.ApiConfig;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.ApiConfig;
public interface ApiConfigService extends IService<ApiConfig> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnOptService.java b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
index 7538c73..fa300cf 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasCrnOpt;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasCrnOpt;
public interface BasCrnOptService extends IService<BasCrnOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 8628feb..91184ac 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -9,38 +9,44 @@
/**
* 鍏ュ簱绔�
+ *
* @return
*/
List<Integer> getAvailableInSite();
/**
* 绌烘澘鍏ュ簱绔�
+ *
* @return
*/
List<Integer> getAvailableEmptyInSite();
/**
* 鍑哄簱绔�
+ *
* @return
*/
List<Integer> getAvailableOutSite(Integer typeNo);
/**
* 绌烘澘鍑哄簱绔�
+ *
* @return
*/
List<Integer> getAvailableEmptyOutSite();
/**
* 鐩爣绔欑偣鐘舵�佹娴�
+ *
* @param devpNo
*/
BasDevp checkSiteStatus(Integer devpNo);
/**
* 鐩爣绔欑偣鐘舵�佹娴�
+ *
* @param devpNo
- * @param put 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
+ * @param put 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
*/
BasDevp checkSiteStatus(Integer devpNo, boolean put);
diff --git a/src/main/java/com/zy/asrs/service/BasErrLogService.java b/src/main/java/com/zy/asrs/service/BasErrLogService.java
index 3c335c1..9d4b294 100644
--- a/src/main/java/com/zy/asrs/service/BasErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasErrLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasErrLog;
public interface BasErrLogService extends IService<BasErrLog> {
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 737a98c..292730d 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -19,6 +19,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鐗╂枡鍙�
* @return locNo 搴撲綅鍙�
*/
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 5e75f6b..3003c63 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -20,6 +20,7 @@
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
+ *
* @param sourceLocNo 婧愬簱浣�
* @return 鍚岀粍绌哄簱浣嶉泦鍚�
*/
@@ -27,6 +28,7 @@
/**
* 鍫嗗灈鏈烘紨绀鸿幏鍙栨簮搴撲綅
+ *
* @param crn
* @return
*/
@@ -34,6 +36,7 @@
/**
* 鍫嗗灈鏈烘紨绀鸿幏鍙栫洰鏍囧簱浣�
+ *
* @param crn
* @return
*/
@@ -41,6 +44,7 @@
/**
* 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ *
* @param locMast
* @return
*/
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
index 7a9515f..27e1975 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.TaskWrkLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskWrkLog;
public interface TaskWrkLogService extends IService<TaskWrkLog> {
diff --git a/src/main/java/com/zy/asrs/service/TaskWrkService.java b/src/main/java/com/zy/asrs/service/TaskWrkService.java
index 41d1ee2..85a5e3f 100644
--- a/src/main/java/com/zy/asrs/service/TaskWrkService.java
+++ b/src/main/java/com/zy/asrs/service/TaskWrkService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskWrk;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/ToWmsService.java b/src/main/java/com/zy/asrs/service/ToWmsService.java
index 85cad3f..e9bce06 100644
--- a/src/main/java/com/zy/asrs/service/ToWmsService.java
+++ b/src/main/java/com/zy/asrs/service/ToWmsService.java
@@ -4,7 +4,6 @@
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.wms.StorageEscalationParam;
-import com.zy.asrs.entity.wms.WmsResult;
public interface ToWmsService {
diff --git a/src/main/java/com/zy/asrs/service/TransferTaskLogService.java b/src/main/java/com/zy/asrs/service/TransferTaskLogService.java
index 2ec6a59..b473135 100644
--- a/src/main/java/com/zy/asrs/service/TransferTaskLogService.java
+++ b/src/main/java/com/zy/asrs/service/TransferTaskLogService.java
@@ -1,8 +1,6 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.TaskWrkLog;
-import com.zy.asrs.entity.TransferTask;
import com.zy.asrs.entity.TransferTaskLog;
public interface TransferTaskLogService extends IService<TransferTaskLog> {
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index d38c79f..a4b6247 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,7 +1,5 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
@@ -9,13 +7,9 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WmsLocStatus;
import com.zy.asrs.mapper.LocMastMapper;
-import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
-import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.HashMap;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 74d742c..4f9173a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -16,7 +16,6 @@
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
@@ -1057,10 +1056,7 @@
}
Random random = new Random();
LocMast locMastEnd = locMasts.get(random.nextInt(locMasts.size()));
- ReturnT<String> result = locMove(locMastStart, locMastEnd, basCrnp.getCrnNo());
- if (!result.isSuccess()) {
- log.error("澶勭悊澶辫触");
- }
+ locMove(locMastStart, locMastEnd, Long.parseLong(basCrnp.getCrnNo().toString()));
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java
index 6a32097..cfc6783 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java
@@ -1,42 +1,11 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.domain.enums.WorkNoType;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.TaskWrkReport;
-import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.mapper.TaskWrkReportMapper;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkReportService;
-import com.zy.asrs.service.TaskWrkService;
-import com.zy.asrs.utils.Utils;
-import com.zy.common.service.CommonService;
-import com.zy.common.utils.HttpHandler;
-import com.zy.core.DevpThread;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CrnTaskModeType;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
-import com.zy.core.model.protocol.StaProtocol;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
@Slf4j
@Service
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 e9979ab..ea3f123 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,16 +1,13 @@
package com.zy.asrs.service.impl;
-import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
-import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -32,11 +29,7 @@
private WrkMastLogService wrkMastLogService;
@Autowired
- private ToWmsService toWmsService;
-
-
-
-
+ private ToWmsService toWmsService;
@Override
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index a78f278..4e81506 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -17,7 +17,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.IOException;
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index e875588..6343b92 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -62,7 +62,7 @@
}
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
@@ -72,7 +72,7 @@
}
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
**/
public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 5234ba5..8be9805 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -39,11 +39,11 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- // 璺戝簱绋嬪簭
+ // 璺戝簱绋嬪簭.鏈皟璇曟祴璇�
//mainService.debug("F");
-
- mainService.transferTaskStart();
- mainService.transferTaskEnd();
+ //鐙珛杈撻�佺嚎浠诲姟.鏈皟璇曟祴璇�
+ //mainService.transferTaskStart();
+ //mainService.transferTaskEnd();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
--
Gitblit v1.9.1