From 07cdd2d370db314d237acb828c76283f1d1f4afd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 31 十二月 2024 20:25:41 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 1
zy-asrs-admin/src/views/out/cacheSite/index.vue | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java | 7 ++
zy-asrs-admin/src/views/out/waveSeed/index.vue | 6 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 6 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java | 14 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 2
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 12 ++++
zy-asrs-admin/src/components/order/order/orderIn.vue | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 5 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 37 +++++++----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java | 24 +++----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 23 ++++---
13 files changed, 94 insertions(+), 46 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index ac26657..073524a 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -229,7 +229,6 @@
};
const onSearch = () => {
- // console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/out/cacheSite/index.vue b/zy-asrs-admin/src/views/out/cacheSite/index.vue
index 7f49927..c550e71 100644
--- a/zy-asrs-admin/src/views/out/cacheSite/index.vue
+++ b/zy-asrs-admin/src/views/out/cacheSite/index.vue
@@ -68,7 +68,7 @@
{
title: formatMessage('db.man_cache_site.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
diff --git a/zy-asrs-admin/src/views/out/waveSeed/index.vue b/zy-asrs-admin/src/views/out/waveSeed/index.vue
index e1b94b7..63cdc00 100644
--- a/zy-asrs-admin/src/views/out/waveSeed/index.vue
+++ b/zy-asrs-admin/src/views/out/waveSeed/index.vue
@@ -53,21 +53,21 @@
{
title: formatMessage('db.man_wave_seed.site_no', '绔欑偣缂栧彿'),
dataIndex: 'siteNo',
- width: 140,
+ width: 110,
ellipsis: true,
...getColumnSearchProps('siteNo'),
},
{
title: formatMessage('db.man_wave_seed.orderNo', '璁㈠崟缂栧彿'),
dataIndex: ['orderDetl$', 'orderNo'],
- width: 140,
+ width: 220,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
{
title: formatMessage('db.man_wave_seed.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['orderDetl$', 'mat$', 'matnr'],
- width: 140,
+ width: 220,
ellipsis: true,
...getColumnSearchProps('matnr'),
},
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index 8b694c3..c6d896b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -23,6 +23,12 @@
return waveManagentService.getSowSeeds();
}
+
+ @GetMapping("/sow/tasks")
+ public R getTasks() {
+ return waveManagentService.getTask();
+ }
+
/**
* 瀹℃牳鎾鐘舵�佷换鍔�
* @param reviewParam
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index 9cdc611..566609c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -187,7 +187,7 @@
//娴佸姩閫氱煡涓嬪彂瀹屾垚鍚庯紝淇敼浠诲姟鐘舵�佷负杈撻�佺嚎娴佸姩涓�傘��
taskService.update(new LambdaUpdateWrapper<Task>()
.eq(Task::getId, task.getId())
- .set(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
+ .set(Task::getTaskSts, TaskStsType.COMPLETE_IN.id));
// log.info(task.getTaskNo() + "涓嬪彂娴佸姩閫氱煡" + commonReponse.getMsg());
// } else {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index ef6edaa..2cc72ce 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -1,12 +1,15 @@
package com.zy.asrs.wms.apis.wcs.services.Impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
+import com.zy.asrs.wms.asrs.entity.Task;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
+import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,6 +20,9 @@
public class WaveManagentServiceImpl implements WaveManagentService {
@Autowired
private WaveSeedService waveSeedService;
+
+ @Autowired
+ private TaskService taskService;
@Override
public R getSowSeeds() {
@@ -38,4 +44,10 @@
return waveSeedService.removeSowById(id);
}
+
+ @Override
+ public R getTask() {
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().ge(Task::getTaskType, 101));
+ return R.ok(list);
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index 30fc4f1..a4223a4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -136,8 +136,9 @@
throw new CoolException(errMsg);
}
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //涓婃姤瀹屾垚鐘舵��
- if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id) {
- taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;
+ if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id || task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id) {
+ //鍑哄簱浠诲姟瀹屾垚锛屼慨鏀圭姸鎬佷负鎾涓紝瀹氭椂浠诲姟鐢熸垚鎾娉㈡
+ taskStsType = TaskStsType.WAVE_SEED;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "浠诲姟";
log.error(errMsg);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
index 914f20a..63e2eb1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -13,4 +13,5 @@
int removeSowSeed(Long id);
+ R getTask();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java
index 2914d27..818e401 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -163,6 +164,12 @@
@ApiModelProperty(value= "娉㈡ID")
private Long waveId;
+ /**
+ * 娉㈡鍙�
+ */
+ @ApiModelProperty(value = "娉㈡鍙�")
+ private String waveNo;
+
public TaskDetl() {}
public TaskDetl(Long taskId,String taskNo,Double anfme,String batch,String barcode,Long orderId,String orderNo,Long detlId,Long matId,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
index ac54096..dbdf564 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java
@@ -9,6 +9,7 @@
import com.zy.asrs.wms.asrs.service.TaskDetlService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -30,6 +31,7 @@
import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_wave_seed")
public class WaveSeed implements Serializable {
@@ -49,6 +51,18 @@
private Long siteId;
/**
+ * 娉㈡ID
+ */
+ @ApiModelProperty(value = "娉㈡ID")
+ private Long waveId;
+
+ /**
+ * 娉㈡鍙�
+ */
+ @ApiModelProperty(value = "娉㈡缂栧彿")
+ private String waveNo;
+
+ /**
* 绔欑偣缂栧彿
*/
@ApiModelProperty(value= "绔欑偣缂栧彿")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index b5b2641..5a132a0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -793,13 +793,21 @@
throw new CoolException("鏈敓鎴愭尝娆�");
}
+ Wave wave = waveService.getById(dto.getWaveId());
+ if (Objects.isNull(wave)) {
+ throw new CoolException("娉㈡涓嶅瓨鍦�");
+ }
+
List<OrderOutMergeParam> params = dto.getList();
if (params.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- Long waveId = dto.getWaveId();
+
+
+// Long waveId = dto.getWaveId();
+// String waveNo = dto.getw
List<Long> filterParamsList = new ArrayList<>();
List<OrderOutMergeParam> filterParams = new ArrayList<>();
@@ -814,7 +822,7 @@
HashMap<String, Double> stockMap = new HashMap<>();
for (OrderOutMergeParam param : filterParams) {
String matUniqueKey = Utils.getMatUniqueKey(param.getMatnr(), param.getBatch(), param.getFieldParams());
- WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
+ WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, wave.getId()));
if(waveDetl == null){
throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦�");
}
@@ -912,7 +920,8 @@
taskDetl.setTaskNo(task.getTaskNo());
taskDetl.setAnfme(merge.getAnfme());
taskDetl.setStock(locDetl.getAnfme());
- taskDetl.setWaveId(waveId);
+ taskDetl.setWaveId(wave.getId());
+ taskDetl.setWaveNo(wave.getWaveNo());
taskDetl.setOrderId(null);
taskDetl.setOrderNo(null);
if (!taskDetlService.save(taskDetl)) {
@@ -935,7 +944,7 @@
//TODO 纭鍚庯紝闇�灏嗘敞閲婃墦寮�
String matUniqueKey = Utils.getMatUniqueKey(taskDetl.getMatnr(), taskDetl.getBatch(), taskDetl.getUniqueField());
// WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getStockIndex, matUniqueKey).eq(WaveDetl::getWaveId, waveId));
- WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, waveId), false);
+ WaveDetl waveDetl = waveDetlService.getOne(new LambdaQueryWrapper<WaveDetl>().eq(WaveDetl::getWaveId, wave.getId()), false);
if (waveDetl == null) {
throw new CoolException("娉㈡鏁版嵁涓嶅瓨鍦�");
}
@@ -946,12 +955,12 @@
}
}
-// //搴撳瓨鏇存柊閫昏緫
- List<Long> orderIds = dto.getList().stream().findFirst().get().getOrderIds();
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, orderIds));
- orderDetls.forEach(orderDetl -> {
- orderUtils.updateWorkQty(orderDetl.getId(), orderDetl.getAnfme());
- });
+ //鍑哄簱搴撳瓨鏇存柊閫昏緫
+// List<Long> orderIds = dto.getList().stream().findFirst().get().getOrderIds();
+// List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().in(OrderDetl::getOrderId, orderIds));
+// orderDetls.forEach(orderDetl -> {
+// orderUtils.updateWorkQty(orderDetl.getId(), orderDetl.getAnfme());
+// });
//搴撲綅F => R
loc.setLocStsId(LocStsType.R.val());
@@ -962,10 +971,10 @@
}
}
- Wave wave = waveService.getById(waveId);
- if (wave == null) {
- throw new CoolException("娉㈡涓嶅瓨鍦�");
- }
+// Wave wave = waveService.getById(dto.getWaveId());
+// if (wave == null) {
+// throw new CoolException("娉㈡涓嶅瓨鍦�");
+// }
wave.setWaveStatus(WaveStatusType.GENERATE.id);
wave.setUpdateTime(new Date());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
index 57d59bb..9f57b6e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
@@ -135,17 +135,17 @@
throw new CoolException("搴撳瓨鏇存柊澶辫触");
} else {
//CacheSite 閲婃斁宸茶鍗犵敤鐨勯�氶亾 //fixme 鎾鍔熻兘瀹屾垚鍚庯紝闇�瑕佸皢杩欓噷娉ㄩ噴鎺�
- List<TaskDetl> detls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()));
- if (!Collections.isEmpty(detls)) {
- List<Long> waveIds = detls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
- List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
- List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
- cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
- .in(CacheSite::getOrderId, orderIds)
- .set(CacheSite::getSiteStatus, 0)
- .set(CacheSite::getOrderId, null)
- .set(CacheSite::getOrderNo, null));
- }
+// List<TaskDetl> detls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()));
+// if (!Collections.isEmpty(detls)) {
+// List<Long> waveIds = detls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
+// List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
+// List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
+// cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
+// .in(CacheSite::getOrderId, orderIds)
+// .set(CacheSite::getSiteStatus, 0)
+// .set(CacheSite::getOrderId, null)
+// .set(CacheSite::getOrderNo, null));
+// }
}
}
} catch (Exception e) {
@@ -159,9 +159,7 @@
//鍏ュ簱
private void executeTask1(Task task) {
Long hostId = task.getHostId();
- //fixme 鏆傛椂鍏抽棴HOSTID
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()));
if (loc == null) {
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index e619af4..5ae1ae3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -96,17 +96,17 @@
Double anfme = taskDetl.getAnfme();
for (OrderDetl orderDetl : orderDetls) {
//fixme 浣滀笟涓暟閲忚皟鏁存斁鑷筹紝鐢熸垚鍑哄簱浠诲姟鎴愬姛鍚�
-// double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);
-// if (issued <= 0.0D) { continue; }
-// if (anfme <= 0.0D) { break; }
-//
-// double workQty = issued;
-// if(anfme - issued < 0){
-// workQty = anfme;
-// }
-// anfme -= workQty;
-//
-// orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) { continue; }
+ if (anfme <= 0.0D) { break; }
+
+ double workQty = issued;
+ if(anfme - issued < 0){
+ workQty = anfme;
+ }
+ anfme -= workQty;
+
+ orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);
CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));
if (cacheSite == null) {
@@ -119,6 +119,7 @@
waveSeed.setOrderNo(orderDetl.getOrderNo());
waveSeed.setOrderId(orderDetl.getOrderId());
waveSeed.setOrderDetlId(orderDetl.getId());
+ waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());
waveSeed.setTaskDetlId(taskDetl.getId());
waveSeed.setAnfme(taskDetl.getAnfme());
waveSeed.setWorkQty(0D);
--
Gitblit v1.9.1