From fb4c2cc68e4eb686b931425c0d24ac4515b31ca9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:24:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 6 ++
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 10 ++++-
src/main/java/com/zy/asrs/entity/Mat.java | 3 -
src/main/java/com/zy/asrs/controller/OutController.java | 5 +-
src/main/java/com/zy/asrs/controller/WorkController.java | 20 +++++-----
src/main/java/com/zy/asrs/controller/WrkMastController.java | 17 +++++---
src/main/java/com/zy/asrs/entity/Order.java | 2
7 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index a5ff1a4..18bcdf0 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -189,9 +189,11 @@
}
log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run_complete")) {
+ JSONObject json = JSONObject.parseObject(params.getData());
+ log.info(params.getSuperTaskNo() + "==============>{}", json);
if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
if (params.getMsgType().equals("task_complete")) {
- if (mast.getIoType() == 53) {
+ if (mast.getIoType() == 53 && !Objects.isNull(json) && json.getInteger("ioType") == 1) {
List<WrkDetl> wrkDetls103 = wrkDetlService
.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
if (wrkDetls103.isEmpty()) {
@@ -220,8 +222,12 @@
}
}
}
+ mast.setWrkSts(4L);
+ } else if ((mast.getIoType() == 54 || mast.getIoType() == 57) ) {
+ mast.setWrkSts(4L);
+ } else if (mast.getIoType() != 53 ) {
+ mast.setWrkSts(4L);
}
- mast.setWrkSts(4L);
}
} else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
if (mast.getWrkSts() != 14) {
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 27011a2..154d3f7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -79,11 +79,15 @@
@RequestMapping(value = "/order/AGV/nav/list/auth")
@ManagerAuth
- public R AGVnavList(@RequestParam(required = false) String orderNo){
+ public R AGVnavList(@RequestParam(required = false) String orderNo, @RequestParam(required = false) String shipCode){
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
+
+ if (!Cools.isEmpty(shipCode)) {
+ wrapper.like("ship_code", shipCode);
+ }
wrapper.le("settle", 2).eq("status", 1);
wrapper.eq("doc_type", OrderTypeEnum.STOCK.type);
wrapper.orderBy("create_time", false);
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0e7d5d9..d9c19e9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -252,6 +252,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
+ if (Objects.isNull(locDto.getStaNo())) {
+ throw new CoolException("搴撲綅锛�" + locDto.getLocNo() + "锛屾湭閫変腑鍑哄簱绔欑偣锛侊紒");
+ }
if (locDto.isLack()) { continue; }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
@@ -334,8 +337,6 @@
if (Cools.isEmpty(locDtos)) {
return R.parse(BaseRes.PARAM);
}
-
-
List<LocDto> locDtoArrayList = new ArrayList<>();
for (LocDto locDto : locDtos){
if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1){
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6de7c6e..579770b 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -37,19 +37,19 @@
@RequestMapping("/available/put/site")
@ManagerAuth()
- public R availablePutSite(){
+ public R availablePutSite() {
return R.ok().add(basDevpService.getAvailableInSite());
}
@RequestMapping("/available/empty/put/site")
@ManagerAuth()
- public R availableEmptyPutSite(){
+ public R availableEmptyPutSite() {
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
@RequestMapping("/available/take/site")
@ManagerAuth()
- public R availableTakeSite(){
+ public R availableTakeSite() {
List<Map<String, Object>> result = new ArrayList<>();
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
for (Integer siteId : outSite) {
@@ -77,13 +77,13 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth()
- public R availableTakeCheckSite(){
+ public R availableTakeCheckSite() {
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
- public R availableEmptyTakeSite(){
+ public R availableEmptyTakeSite() {
return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@@ -93,8 +93,8 @@
try {
String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
- } catch (Exception e){
- return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+ } catch (Exception e) {
+ return R.error("鍏ュ簱鍚姩澶辫触==>" + e.getMessage());
}
}
@@ -136,10 +136,10 @@
@RequestMapping("/mat/turn/over/out/start")
@ManagerAuth(memo = "鍝佸彿绉讳氦")
public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) {
return R.error("鍙傛暟涓虹┖");
}
- if (param.getLocDetls().size()>1){
+ if (param.getLocDetls().size() > 1) {
return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
}
workService.turnMatLocDetl(param, getUserId());
@@ -156,7 +156,7 @@
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
- @RequestParam Integer type){
+ @RequestParam Integer type) {
if (type == 1) {
workService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 06a42ff..7fad2d2 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -15,7 +15,6 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.WrkDetlServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -52,7 +51,6 @@
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMast.class, param.keySet(), wrapper, condition);
-
if (!Cools.isEmpty(orderNo)) {
List<WrkDetl> detls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
if (!Cools.isEmpty(detls)) {
@@ -169,10 +167,10 @@
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
for (WrkMast entity : list){
- entity.setIoPri(entity.getIoPri() + 1);
- if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) {
- throw new CoolException("浼樺厛绾ф洿鏂板け璐�!");
- }
+ entity.setIoPri(entity.getIoPri() + 1);
+ if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) {
+ throw new CoolException("浼樺厛绾ф洿鏂板け璐�!");
+ }
}
// wrkMastService.updateBatchById(list);
return R.ok();
@@ -180,14 +178,19 @@
@RequestMapping(value = "/wrkMast/red/pri/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
+ @Transactional(rollbackFor = Exception.class)
+
public R redPri(@RequestBody List<WrkMast> list) {
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
for (WrkMast entity : list){
entity.setIoPri(entity.getIoPri() - 1);
+ if (!wrkMastService.update(entity, new EntityWrapper<WrkMast>().eq("wrk_no", entity.getWrkNo()))) {
+ throw new CoolException("浼樺厛绾ф洿鏂板け璐�!");
+ }
}
- wrkMastService.updateBatchById(list);
+// wrkMastService.updateBatchById(list);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 2dc08a8..262fd8e 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -339,9 +339,6 @@
@TableField("store_max_date")
private Integer storeMaxDate;
- /**
- * 鍑哄簱浼樺厛绾�
- */
@TableField("rank")
private String rank;
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 3d0365f..48b034c 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -209,7 +209,7 @@
/**
* 鐗╂祦鍚嶇О
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value= "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
--
Gitblit v1.9.1