From ebdfa825c07189b5f8e89f147d96d1bc612589db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:32:17 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 74 ++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 12
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockItemService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 21 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 14
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 20 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 38 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderItemMapper.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 36 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 14
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java | 9
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderItemService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderItemServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 41 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java | 7
rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 34 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 26 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 36 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java | 26 +-
36 files changed, 252 insertions(+), 262 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java
index bc014a0..b059381 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/params/PublicToStockParams.java
@@ -1,8 +1,6 @@
package com.vincent.rsf.server.api.controller.params;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
-import com.vincent.rsf.server.manager.entity.WaitPakinItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +17,6 @@
private String locCode;
@ApiModelProperty("鍗曟嵁鏄庣粏")
- private List<AsnOrderItem> itemList;
+ private List<WkOrderItem> itemList;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
index aced56a..06641fd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
@@ -1,6 +1,6 @@
package com.vincent.rsf.server.api.entity.dto;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.TaskItem;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -14,6 +14,6 @@
public class ContainerWaveDto {
private TaskItem taskItem;
- private List<AsnOrderItem> asnOrderItems;
+ private List<WkOrderItem> wkOrderItems;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java
index 861b04d..96d3eea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/OperateStockDto.java
@@ -1,8 +1,8 @@
package com.vincent.rsf.server.api.entity.dto;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
-public class OperateStockDto extends AsnOrderItem {
+public class OperateStockDto extends WkOrderItem {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 299b122..3a06b70 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -176,14 +176,14 @@
if (StringUtils.isBlank(barcode)) {
return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getTrackCode, barcode));
+ List<WkOrderItem> wkOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getTrackCode, barcode));
- if (Objects.isNull(asnOrderItem)) {
+ if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderItem record : asnOrderItem) {
+ List<WkOrderItem> items = new ArrayList<>();
+ for (WkOrderItem record : wkOrderItem) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -269,7 +269,7 @@
// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getId, dto.getId()));
//asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
if (Objects.isNull(orderItem)) {
@@ -348,7 +348,7 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
- private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
Companys companys = new Companys();
if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
@@ -452,18 +452,18 @@
throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
- .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+ List<WkOrderItem> wkOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnCode, params.getAsnCode())
+ .eq(!Objects.isNull(params.getTrackCode()), WkOrderItem::getTrackCode, params.getTrackCode())
+ .eq(!Cools.isEmpty(params.getMatnrCode()), WkOrderItem::getMatnrCode, params.getMatnrCode())
);
- if (Objects.isNull(asnOrderItem)) {
+ if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderItem record : asnOrderItem) {
+ List<WkOrderItem> items = new ArrayList<>();
+ for (WkOrderItem record : wkOrderItem) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -578,7 +578,7 @@
}
InspectDetlDto detlDto = new InspectDetlDto();
detlDto.setCode(wkOrders.getCode()).setId(wkOrders.getId()).setPoCode(wkOrders.getPoCode());
- List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));
+ List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
} else {
@@ -761,8 +761,8 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
- List<AsnOrderItem> itemList = params.getItemList();
- double sum = itemList.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> itemList = params.getItemList();
+ double sum = itemList.stream().mapToDouble(WkOrderItem::getAnfme).sum();
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
@@ -978,7 +978,7 @@
*/
@Override
public R defectProducts(String trackCode) {
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, trackCode));
+ WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getTrackCode, trackCode));
return R.ok(orderItem);
}
@@ -1050,7 +1050,7 @@
/**
* 鑾峰彇ReceiptDetlsDtos
*/
- private R getAsnOrderItem(List<AsnOrderItem> items) {
+ private R getAsnOrderItem(List<WkOrderItem> items) {
List<ReceiptDetlsDto> detlsDtos = new ArrayList<>();
items.forEach(asnOrderItem -> {
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 0cd9636..6b5d540 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -71,7 +71,7 @@
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
maps.keySet().forEach(key -> {
- AsnOrderItem orderItem = asnOrderItemService.getById(key);
+ WkOrderItem orderItem = asnOrderItemService.getById(key);
if (Objects.isNull(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -120,13 +120,13 @@
throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
}
List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- ArrayList<AsnOrderItem> list = new ArrayList<>();
+ ArrayList<WkOrderItem> list = new ArrayList<>();
List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
for (WkOrder wkOrder : wkOrderList) {
- AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, wkOrder.getId())
- .eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(AsnOrderItem::getSplrBatch, taskItem.getBatch())
+ WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, wkOrder.getId())
+ .eq(WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
+ .eq(WkOrderItem::getSplrBatch, taskItem.getBatch())
);
if (null != orderItem){
list.add(orderItem);
@@ -134,7 +134,7 @@
}
- containerWaveDto.setAsnOrderItems(list);
+ containerWaveDto.setWkOrderItems(list);
containerWaveDtos.add(containerWaveDto);
}
@@ -158,17 +158,17 @@
for (ContainerWaveDto containerWaveDto : containerWaveParam.getContainerWaveDtos()) {
//鍋氫竴娆℃牎楠岋紝鍒ゆ柇鍓嶇鎵�鏈夊嚭搴撴暟閲忔槸鍚﹁秴杩囨湰鎵樺嚭搴撴暟閲�
- double sum = containerWaveDto.getAsnOrderItems().stream().mapToDouble(AsnOrderItem::getDemandQty).sum();
+ double sum = containerWaveDto.getWkOrderItems().stream().mapToDouble(WkOrderItem::getDemandQty).sum();
BigDecimal total = new BigDecimal(String.valueOf(sum));
BigDecimal anfme = new BigDecimal(containerWaveDto.getTaskItem().getAnfme().toString());
if (!anfme.equals(total)){
throw new CoolException("鎾鏁伴噺涓嶇瓑浜庡鍣ㄥ嚭搴撴暟閲忥紝璇锋鏌�");
}
- for (AsnOrderItem oldOrderItem : containerWaveDto.getAsnOrderItems()) {
+ for (WkOrderItem oldOrderItem : containerWaveDto.getWkOrderItems()) {
if (Double.compare(oldOrderItem.getDemandQty(), 0.0) == 0) {
continue;
}
- AsnOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
+ WkOrderItem orderItem = asnOrderItemService.getById(oldOrderItem.getId());
BigDecimal num = new BigDecimal(orderItem.getWorkQty().toString()).subtract(new BigDecimal(orderItem.getQty().toString()));
BigDecimal orderDemandQty = new BigDecimal(oldOrderItem.getDemandQty().toString());
if (num.compareTo(orderDemandQty) < 0){
@@ -227,8 +227,8 @@
return wkOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
- private Boolean checkOrderComplete(AsnOrderItem orderItem) {
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, orderItem.getAsnCode()));
- return asnOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ private Boolean checkOrderComplete(WkOrderItem orderItem) {
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnCode, orderItem.getAsnCode()));
+ return wkOrderItems.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index b65b741..e27fe48 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -12,7 +12,7 @@
import com.vincent.rsf.server.api.entity.params.ErpInspectParams;
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
@@ -130,24 +130,24 @@
longSet.add(Long.parseLong(set));
});
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoDetlId, longSet));
- if (asnOrderItems.isEmpty()) {
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getPoDetlId, longSet));
+ if (wkOrderItems.isEmpty()) {
throw new CoolException("ASN鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<Long> list = asnOrderItems.stream().map(AsnOrderItem::getId).collect(Collectors.toList());
+ List<Long> list = wkOrderItems.stream().map(WkOrderItem::getId).collect(Collectors.toList());
/************************** 淇敼ASN鏄庣粏鍗曠姸鎬� ******************************/
- if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getNtyStatus, 1))) {
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>().in(WkOrderItem::getId, list).set(WkOrderItem::getNtyStatus, 1))) {
throw new CoolException("ASN鏄庣粏鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
/************************** 淇敼ASN涓诲崟鏁版嵁 ******************************/
//鑾峰彇ASN鏄庣粏璁㈠崟鏍囪瘑
- List<Long> ids = asnOrderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
+ List<Long> ids = wkOrderItems.stream().map(WkOrderItem::getAsnId).collect(Collectors.toList());
//ASN鏄庣粏鍗曟嵁鍒嗙粍
- Map<Long, List<AsnOrderItem>> asnIds = asnOrderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
+ Map<Long, List<WkOrderItem>> asnIds = wkOrderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getAsnId));
ids.forEach(id -> {
int count = asnOrderService.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id));
if (count == asnIds.get(id).size()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
index 99b86d6..2bd086e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -8,6 +8,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -17,7 +18,6 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
@@ -152,8 +152,8 @@
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
for (WkOrder order : orders) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- for (AsnOrderItem item : orderItems) {
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
+ for (WkOrderItem item : orderItems) {
if (Objects.isNull(item)) {
continue;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index 5dd2240..26996e9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -14,9 +14,8 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Companys;
-import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -48,11 +47,11 @@
@PostMapping("/asnOrderItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
/**鎷兼帴鎵╁睍瀛楁*/
- PageParam<AsnOrderItem, BaseParam> page = asnOrderItemService.page(pageParam, pageParam.buildWrapper(true));
- List<AsnOrderItem> records = page.getRecords();
- for (AsnOrderItem record : records) {
+ PageParam<WkOrderItem, BaseParam> page = asnOrderItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<WkOrderItem> records = page.getRecords();
+ for (WkOrderItem record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -100,21 +99,21 @@
@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrderItem/update")
- public R update(@RequestBody AsnOrderItem asnOrderItem) {
- asnOrderItem.setUpdateBy(getLoginUserId());
- asnOrderItem.setUpdateTime(new Date());
- if (!Objects.isNull(asnOrderItem.getSplrName()) && StringUtils.isNotBlank(asnOrderItem.getSplrName())) {
+ public R update(@RequestBody WkOrderItem wkOrderItem) {
+ wkOrderItem.setUpdateBy(getLoginUserId());
+ wkOrderItem.setUpdateTime(new Date());
+ if (!Objects.isNull(wkOrderItem.getSplrName()) && StringUtils.isNotBlank(wkOrderItem.getSplrName())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
.eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
- .eq(Companys::getId, asnOrderItem.getSplrName()));
+ .eq(Companys::getId, wkOrderItem.getSplrName()));
if (!Objects.isNull(companys)) {
- asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ wkOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
}
}
- if (!asnOrderItemService.updateById(asnOrderItem)) {
+ if (!asnOrderItemService.updateById(wkOrderItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrderItem);
+ return R.ok("Update Success").add(wkOrderItem);
}
@PreAuthorize("hasAuthority('manager:asnOrderItem:remove')")
@@ -131,9 +130,9 @@
@PostMapping("/asnOrderItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrderItem> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrderItem::getId, condition);
+ wrapper.like(WkOrderItem::getId, condition);
}
asnOrderItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
@@ -145,13 +144,13 @@
@PostMapping("/asnOrderItem/export")
@ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
if (!ids.isEmpty()) {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .in(AsnOrderItem::getId, ids)
- .eq(AsnOrderItem::getStatus, 1));
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getId, ids)
+ .eq(WkOrderItem::getStatus, 1));
} else {
orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
}
@@ -159,7 +158,7 @@
orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
}
- ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(orderItems, WkOrderItem.class, true), response);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index dc74d9c..5b13799 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -10,8 +10,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -43,8 +42,8 @@
@PostMapping("/checkItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> wrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
return R.ok().add(checkOrderItemService.page(pageParam, wrapper));
}
@@ -69,7 +68,7 @@
@PreAuthorize("hasAuthority('manager:check:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/save")
- public R save(@RequestBody AsnOrderItem order) {
+ public R save(@RequestBody WkOrderItem order) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, order);
if (Objects.isNull(ruleCode)) {
throw new RuntimeException("鐩樼偣鍗曞彿鐢熸垚澶辫触锛侊紒");
@@ -83,7 +82,7 @@
@PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/checkItem/update")
- public R update(@RequestBody AsnOrderItem order) {
+ public R update(@RequestBody WkOrderItem order) {
order.setUpdateTime(null);
order.setUpdateBy(getLoginUserId());
if (!checkOrderItemService.updateById(order)) {
@@ -106,9 +105,9 @@
@PostMapping("/checkItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrderItem> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrderItem::getAsnCode, condition);
+ wrapper.like(WkOrderItem::getAsnCode, condition);
}
checkOrderItemService.page(new Page<>(1, 20), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getAsnCode()))
@@ -125,13 +124,13 @@
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrderItem> orders = new ArrayList<>();
+ List<WkOrderItem> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orders = checkOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")));
+ orders = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, map.get("ids")));
} else {
orders = checkOrderItemService.list();
}
- ExcelUtil.build(ExcelUtil.create(orders, AsnOrderItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(orders, WkOrderItem.class), response);
}
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 833bb08..b1fa27e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -22,7 +23,6 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.service.OutStockItemService;
@@ -175,7 +175,7 @@
if (list.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list));
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, list));
if (orderItems.isEmpty()) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -200,8 +200,8 @@
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
for (WkOrder order : orders) {
- List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
- for (AsnOrderItem item : orderItems) {
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
+ for (WkOrderItem item : orderItems) {
if (Objects.isNull(item)) {
continue;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
index 0a45890..457352c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
@@ -14,7 +14,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.excel.OutStockTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
@@ -47,8 +47,8 @@
@PostMapping("/outStockItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> queryWrapper = pageParam.buildWrapper(true);
return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
}
@@ -90,21 +90,21 @@
@PreAuthorize("hasAuthority('manager:outStockItem:update')")
@OperationLog("Update 鍑哄簱鍗曟槑缁�")
@PostMapping("/outStockItem/update")
- public R update(@RequestBody AsnOrderItem asnOrderItem) {
- asnOrderItem.setUpdateBy(getLoginUserId());
- asnOrderItem.setUpdateTime(new Date());
- if (!Objects.isNull(asnOrderItem.getSplrName()) && StringUtils.isNotBlank(asnOrderItem.getSplrName())) {
+ public R update(@RequestBody WkOrderItem wkOrderItem) {
+ wkOrderItem.setUpdateBy(getLoginUserId());
+ wkOrderItem.setUpdateTime(new Date());
+ if (!Objects.isNull(wkOrderItem.getSplrName()) && StringUtils.isNotBlank(wkOrderItem.getSplrName())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
.eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val)
- .eq(Companys::getId, asnOrderItem.getSplrName()));
+ .eq(Companys::getId, wkOrderItem.getSplrName()));
if (!Objects.isNull(companys)) {
- asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ wkOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
}
}
- if (!outStockItemService.updateById(asnOrderItem)) {
+ if (!outStockItemService.updateById(wkOrderItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrderItem);
+ return R.ok("Update Success").add(wkOrderItem);
}
@@ -122,9 +122,9 @@
@PostMapping("/outStockItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrderItem> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrderItem::getId, condition);
+ wrapper.like(WkOrderItem::getId, condition);
}
outStockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
@@ -137,13 +137,13 @@
@PostMapping("/outStockItem/export")
@ApiOperation("瀵煎嚭鍑哄簱鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
if (!ids.isEmpty()) {
- orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .in(AsnOrderItem::getId, ids)
- .eq(AsnOrderItem::getStatus, 1));
+ orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getId, ids)
+ .eq(WkOrderItem::getStatus, 1));
} else {
orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
}
@@ -151,7 +151,7 @@
orderItems = outStockItemService.list(new LambdaQueryWrapper<>());
}
- ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
+ ExcelUtil.build(ExcelUtil.create(orderItems, WkOrderItem.class, true), response);
}
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
index e49c304..ae34794 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
@@ -10,7 +10,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.entity.PurchaseItem;
import com.vincent.rsf.server.manager.enums.POExceStatus;
@@ -116,7 +116,7 @@
public R remove(@PathVariable Long[] ids) {
List<Purchase> purchases = purchaseService.listByIds(Arrays.asList(ids));
Set<String> stringSet = purchases.stream().map(Purchase::getCode).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoCode, stringSet));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getPoCode, stringSet));
if (!orderItems.isEmpty()) {
return R.error("鍗曟嵁鏈夊凡鐢熸垚鐨勬敹璐у崟鏄庣粏锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index 3ed3d9f..51fa55c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -12,8 +12,6 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.system.controller.BaseController;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
similarity index 95%
rename from rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index a763bf4..22baa15 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -26,7 +26,7 @@
@Data
@Accessors(chain = true)
@TableName("man_asn_order_item")
-public class AsnOrderItem implements Serializable {
+public class WkOrderItem implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -280,9 +280,9 @@
@TableField(exist = false)
private Double demandQty = 0.0;
//
- public AsnOrderItem() {}
+ public WkOrderItem() {}
- public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public WkOrderItem(Long asnId, String asnCode, Long poDetlId, String matnrCode, String poCode, Long matnrId, String matnk, Double anfme, String stockUnit, Double purQty, String purUnit, Double qty, String splrCode, String splrName, String qrcode, String barcode, String packName, Integer status, Integer ntyStatus, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.asnId = asnId;
this.asnCode = asnCode;
this.poDetlId = poDetlId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
index dc48b56..71bfff3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderItemMapper.java
@@ -6,21 +6,20 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
-import java.util.List;
import java.util.Map;
@Mapper
@Repository
-public interface AsnOrderItemMapper extends BaseMapper<AsnOrderItem> {
+public interface AsnOrderItemMapper extends BaseMapper<WkOrderItem> {
- IPage<Map<String, Object>> resultForMap(PageParam<AsnOrderItem, BaseParam> pages, @Param(Constants.WRAPPER) QueryWrapper<AsnOrderItem> buildWrapper);
+ IPage<Map<String, Object>> resultForMap(PageParam<WkOrderItem, BaseParam> pages, @Param(Constants.WRAPPER) QueryWrapper<WkOrderItem> buildWrapper);
- AsnOrderItem resultById(@Param(Constants.WRAPPER) LambdaQueryWrapper<AsnOrderItem> buildWrapper);
+ WkOrderItem resultById(@Param(Constants.WRAPPER) LambdaQueryWrapper<WkOrderItem> buildWrapper);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderItemMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderItemMapper.java
index 24460a6..bf5c873 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderItemMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderItemMapper.java
@@ -1,12 +1,12 @@
package com.vincent.rsf.server.manager.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface CheckOrderItemMapper extends BaseMapper<AsnOrderItem> {
+public interface CheckOrderItemMapper extends BaseMapper<WkOrderItem> {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index 919628f..72d1db7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
@@ -94,7 +94,7 @@
*/
private void moveOrderToLog(List<WkOrder> wkOrders, String type) {
Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getAsnId, longSet));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
@@ -114,7 +114,7 @@
}
List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
@@ -129,7 +129,7 @@
}
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getAsnId, longSet))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
if (!this.asnOrderService.removeByIds(longSet)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index b74f20f..188f14c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -81,12 +81,12 @@
List<WkOrder> orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
if (!orders.isEmpty()) {
for (WkOrder order : orders) {
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
if (orderItems.isEmpty()) {
return;
}
List<WarehouseAreasItem> items = new ArrayList<>();
- for (AsnOrderItem item : orderItems) {
+ for (WkOrderItem item : orderItems) {
WarehouseAreas one = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
.eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
Long areaId = Objects.isNull(one) ? null : one.getId();
@@ -107,7 +107,7 @@
//鏇存柊鏀惰揣鍖哄簱瀛�
extracted(one, item, order, matnr);
- if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().set(AsnOrderItem::getQty, item.getAnfme()).eq(AsnOrderItem::getId, item.getId()))) {
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>().set(WkOrderItem::getQty, item.getAnfme()).eq(WkOrderItem::getId, item.getId()))) {
throw new CoolException("鏀惰揣鍗曟槑缁嗗畬鎴愭暟閲忎慨鏀瑰け璐ワ紒锛�");
}
}
@@ -132,7 +132,7 @@
* @description: 鏀惰揣鍖哄簱瀛樻洿鏂�
* @version 1.0
*/
- private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
+ private void extracted(WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
Companys companys = new Companys();
if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
@@ -231,9 +231,9 @@
if (!asnOrderService.save(order)) {
throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
items.forEach(item -> {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
@@ -284,13 +284,13 @@
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void generateMatnrLabel() {
- List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .isNull(AsnOrderItem::getTrackCode)
- .select(AsnOrderItem::getId));
+ List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .isNull(WkOrderItem::getTrackCode)
+ .select(WkOrderItem::getId));
if (Objects.isNull(list) || list.isEmpty()) {
return;
}
- List<AsnOrderItem> items = new ArrayList<>();
+ List<WkOrderItem> items = new ArrayList<>();
list.forEach(item -> {
String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
if (StringUtils.isBlank(trackCode)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
index 2978b52..54282b5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
@@ -6,14 +6,14 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public interface AsnOrderItemService extends IService<AsnOrderItem> {
+public interface AsnOrderItemService extends IService<WkOrderItem> {
R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;
@@ -22,6 +22,6 @@
R generateBarcode(List<Long> orders);
- IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper);
+ IPage<Map<String, Object>> listByAsnId(PageParam<WkOrderItem, BaseParam> pageParam, QueryWrapper<WkOrderItem> buildWrapper);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderItemService.java
index 73b78c7..f1758ca 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderItemService.java
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
-public interface CheckOrderItemService extends IService<AsnOrderItem> {
+public interface CheckOrderItemService extends IService<WkOrderItem> {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockItemService.java
index 20f7a50..5dc32e7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockItemService.java
@@ -6,20 +6,18 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-public interface OutStockItemService extends IService<AsnOrderItem> {
+public interface OutStockItemService extends IService<WkOrderItem> {
boolean fieldsSave(Map<String, Object> params);
R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;
- IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper);
+ IPage<Map<String, Object>> listByAsnId(PageParam<WkOrderItem, BaseParam> pageParam, QueryWrapper<WkOrderItem> buildWrapper);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
index 75e4644..c482666 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java
@@ -7,7 +7,7 @@
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
import java.util.List;
@@ -30,6 +30,6 @@
R getSiteNos();
- R cancelOutOrderByItems(List<AsnOrderItem> orderItems);
+ R cancelOutOrderByItems(List<WkOrderItem> orderItems);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
index 0a709cf..b65005c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java
@@ -4,7 +4,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.IsptOrderParam;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
@@ -13,7 +13,7 @@
public interface QlyInspectService extends IService<QlyInspect> {
- List<AsnOrderItem> listByAsn(Map<String, Object> map);
+ List<WkOrderItem> listByAsn(Map<String, Object> map);
R allSave(QlyInspectAndItem params);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 4033ee4..fed968f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -11,6 +11,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -23,7 +24,6 @@
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.AsnOrderService;
@@ -45,7 +45,7 @@
import java.util.stream.Collectors;
@Service("asnOrderItemService")
-public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService {
+public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements AsnOrderItemService {
@Autowired
private AsnOrderService asnOrderMapper;
@@ -72,7 +72,7 @@
if (Objects.isNull(orders) || orders.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderItem> items = this.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, orders));
+ List<WkOrderItem> items = this.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getId, orders));
if (items.isEmpty()) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -137,9 +137,9 @@
if (!asnOrderMapper.save(order)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> items = new ArrayList<>();
+ List<WkOrderItem> items = new ArrayList<>();
for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
if (StringUtils.isBlank(orderTemplate.getMatnrCode())) {
throw new CoolException(orderTemplate.getCode() + "锛氱墿鏂欑紪鐮佷笉鑳戒负绌猴紒锛�");
}
@@ -202,7 +202,7 @@
}
if (!items.isEmpty()) {
// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
- double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double anfme = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>()
// .set(AsnOrder::getQty, qty)
.set(WkOrder::getAnfme, anfme)
@@ -226,26 +226,26 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
- AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
- if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
+ WkOrderItem wkOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), WkOrderItem.class);
+ if (StringUtils.isNoneBlank(wkOrderItem.getSplrCode())) {
Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>()
- .eq(Companys::getId, asnOrderItem.getSplrCode())
+ .eq(Companys::getId, wkOrderItem.getSplrCode())
.eq(Companys::getType, CompanysType.COMPANYS_TYPE_SUPPLIER.val));
if (!Objects.isNull(companys)) {
- asnOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
+ wkOrderItem.setSplrCode(companys.getCode()).setSplrName(companys.getName());
}
}
- if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
+ if (Objects.isNull(wkOrderItem.getAnfme()) || Double.compare(wkOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
}
//淇濆瓨鎵╁睍瀛楁
try {
StringBuffer sb = new StringBuffer();
- if (Objects.isNull(asnOrderItem.getFieldsIndex()) || StringUtils.isBlank(asnOrderItem.getFieldsIndex())) {
- sb.append(asnOrderItem.getMatnrId() + asnOrderItem.getSplrBatch() );
+ if (Objects.isNull(wkOrderItem.getFieldsIndex()) || StringUtils.isBlank(wkOrderItem.getFieldsIndex())) {
+ sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch() );
//鑾峰彇16浣島uid
String uuid16 = Cools.md5Chinese(sb.toString());
- asnOrderItem.setFieldsIndex(uuid16);
+ wkOrderItem.setFieldsIndex(uuid16);
params.put("index", uuid16);
}
//淇濆瓨鎴栨洿鏂板姩鎬佸瓧娈靛��
@@ -253,15 +253,15 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
- if (!this.saveOrUpdate(asnOrderItem)) {
+ wkOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
+ if (!this.saveOrUpdate(wkOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
return true;
}
@Override
- public IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper) {
+ public IPage<Map<String, Object>> listByAsnId(PageParam<WkOrderItem, BaseParam> pageParam, QueryWrapper<WkOrderItem> buildWrapper) {
IPage<Map<String, Object>> hsahMap = this.baseMapper.resultForMap(pageParam, buildWrapper);
if (hsahMap.getRecords().isEmpty()) {
return hsahMap.setRecords(new ArrayList<>());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
index 13d4c7b..85dc13f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
@@ -4,7 +4,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderLogMapper;
@@ -63,10 +63,10 @@
List<AsnOrderItemLog> itemLogs = asnOrderItemLogService
.list(new LambdaQueryWrapper<AsnOrderItemLog>()
.eq(AsnOrderItemLog::getLogId, id));
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(itemLogs) || !itemLogs.isEmpty()) {
for (AsnOrderItemLog itemLog : itemLogs) {
- AsnOrderItem item = new AsnOrderItem();
+ WkOrderItem item = new WkOrderItem();
BeanUtils.copyProperties(itemLog, item);
item.setId(itemLog.getAsnItemId())
.setAsnId(order.getId())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 8096cb2..02fc8aa 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -85,13 +85,13 @@
if (Objects.isNull(params)) {
throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))
- .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .like(!Objects.isNull(params.get("maktx")), WkOrderItem::getMaktx, params.get("maktx"))
+ .eq(!Objects.isNull(params.get("matnrCode")), WkOrderItem::getMatnrCode, params.get("matnrCode")));
if (orderItems.isEmpty()) {
return new ArrayList<>();
}
- List<Long> longList = orderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
+ List<Long> longList = orderItems.stream().map(WkOrderItem::getAsnId).collect(Collectors.toList());
return this.listByIds(longList);
}
@@ -175,9 +175,9 @@
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, params.getOrders().getId()));
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
@@ -276,9 +276,9 @@
if (!this.save(order)) {
throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
for (PurchaseItem item : itemList) {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
@@ -323,7 +323,7 @@
}
}
- double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
if (!asnOrderItemService.saveBatch(orderItems)) {
throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
@@ -354,8 +354,8 @@
@Transactional(rollbackFor = Exception.class)
public R removeOrders(List<Long> ids) {
for (Long id : ids) {
- List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, id));
+ List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, id));
if (list.isEmpty()) {
continue;
}
@@ -371,7 +371,7 @@
}
});
- double sum = list.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double sum = list.stream().mapToDouble(WkOrderItem::getAnfme).sum();
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
@@ -393,8 +393,8 @@
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
- .in(AsnOrderItem::getAsnId, ids))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getAsnId, ids))) {
// throw new CoolException("Details Delete Fail");
}
@@ -418,7 +418,7 @@
if (!this.updateById(asrder)) {
throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, asrder.getId()));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
@@ -440,7 +440,7 @@
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
@@ -453,7 +453,7 @@
if (!asnOrderItemLogService.saveBatch(logs)) {
throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
if (!this.removeById(asrder.getId())) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderItemServiceImpl.java
index e638a12..9f1297e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderItemServiceImpl.java
@@ -1,12 +1,12 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.mapper.CheckOrderItemMapper;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
import org.springframework.stereotype.Service;
@Service("checkOrderItemService")
-public class CheckOrderItemServiceImpl extends ServiceImpl<CheckOrderItemMapper, AsnOrderItem> implements CheckOrderItemService {
+public class CheckOrderItemServiceImpl extends ServiceImpl<CheckOrderItemMapper, WkOrderItem> implements CheckOrderItemService {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index ce7a1ca..cefe11f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -10,7 +10,7 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
@@ -79,9 +79,9 @@
if (!this.save(order)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> items = new ArrayList<>();
+ List<WkOrderItem> items = new ArrayList<>();
for (CheckOrderTemplate orderTemplate : listMap.get(key)) {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
Matnr matnr = null;
if (StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
@@ -104,7 +104,7 @@
}
}
if (!items.isEmpty()) {
- double purQty = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
if (!this.update(new LambdaUpdateWrapper<WkOrder>()
.set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
.set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) {
@@ -178,9 +178,9 @@
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
- List<AsnOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
- Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, params.getOrders().getId()));
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
index f9fa5dd..ad82842 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
@@ -11,6 +11,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.OutStockTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -20,7 +21,6 @@
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.MatnrService;
@@ -45,7 +45,7 @@
* @create 2025/4/22 11:35
*/
@Service("outStockItemServiceImpl")
-public class OutStockItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements OutStockItemService {
+public class OutStockItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, WkOrderItem> implements OutStockItemService {
@Autowired
private OutStockService outStockService;
@@ -64,13 +64,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean fieldsSave(Map<String, Object> params) {
- AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
- if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
- asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
+ WkOrderItem wkOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), WkOrderItem.class);
+ if (StringUtils.isBlank(wkOrderItem.getTrackCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, wkOrderItem);
+ wkOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
;
}
- if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
+ if (Objects.isNull(wkOrderItem.getAnfme()) || Double.compare(wkOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏀惰揣鏁颁笉鑳戒负绌猴紒锛�");
}
//淇濆瓨鎵╁睍瀛楁
@@ -78,12 +78,12 @@
String uuid16 = CommonUtil.randomUUID16();
Boolean fields = FieldsUtils.saveFields(params, uuid16);
if (fields) {
- asnOrderItem.setFieldsIndex(uuid16);
+ wkOrderItem.setFieldsIndex(uuid16);
}
} catch (Exception e) {
throw new RuntimeException(e);
}
- if (!this.saveOrUpdate(asnOrderItem)) {
+ if (!this.saveOrUpdate(wkOrderItem)) {
throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
}
return true;
@@ -122,9 +122,9 @@
if (!outStockService.save(order)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> items = new ArrayList<>();
+ List<WkOrderItem> items = new ArrayList<>();
for (OutStockTemplate orderTemplate : listMap.get(key)) {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
Matnr matnr = null;
if (StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
@@ -148,7 +148,7 @@
}
}
if (!items.isEmpty()) {
- double purQty = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
if (!outStockService.update(new LambdaUpdateWrapper<WkOrder>()
.set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
.set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) {
@@ -168,7 +168,7 @@
* @time 2025/4/22 12:39
*/
@Override
- public IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper) {
+ public IPage<Map<String, Object>> listByAsnId(PageParam<WkOrderItem, BaseParam> pageParam, QueryWrapper<WkOrderItem> buildWrapper) {
IPage<Map<String, Object>> hsahMap = this.baseMapper.resultForMap(pageParam, buildWrapper);
if (hsahMap.getRecords().isEmpty()) {
return hsahMap.setRecords(new ArrayList<>());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index cc537cf..dd29375 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -98,9 +98,9 @@
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, params.getOrders().getId()));
- Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, params.getOrders().getId()));
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
orders.setAnfme(sum);
if (!this.updateById(orders)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
@@ -129,9 +129,9 @@
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒");
}
- List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id));
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, id));
if (!orderItems.isEmpty()) {
- for (AsnOrderItem orderItem : orderItems) {
+ for (WkOrderItem orderItem : orderItems) {
if (!Objects.isNull(orderItem.getPoDetlId())) {
DeliveryItem deliveryItem = deliveryItemService.getById(orderItem.getPoDetlId());
Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 10000) / 10000.0;
@@ -155,7 +155,7 @@
if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
- if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id))) {
+ if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, id))) {
throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
return R.ok("鎿嶄綔鎴愬姛");
@@ -201,10 +201,10 @@
if (!this.save(order)) {
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
listMap.get(key).forEach(item -> {
DeliveryItem deliveryItem = deliveryItemService.getById(item.getId());
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
if (item.getAnfme().compareTo(0.0) <= 0) {
throw new CoolException("鍑哄簱鏁伴噺涓嶈兘灏忎簬鎴栫瓑浜庨浂锛侊紒");
}
@@ -241,7 +241,7 @@
}
});
- Double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
//淇敼璁″垝鏁伴噺
order.setAnfme(sum).setWorkQty(0.0);
if (!this.saveOrUpdate(order)) {
@@ -304,9 +304,9 @@
}
List<Long> list = orders.stream().map(WkOrder::getId).collect(Collectors.toList());
- List<AsnOrderItem> orderItems = asnOrderItemService
- .list(new LambdaQueryWrapper<AsnOrderItem>()
- .in(AsnOrderItem::getAsnId, list).apply("anfme > work_qty"));
+ List<WkOrderItem> orderItems = asnOrderItemService
+ .list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getAsnId, list).apply("anfme > work_qty"));
if (orderItems.isEmpty()) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -330,7 +330,7 @@
*璁㈠崟淇℃伅瀛樺偍鑷抽�昏緫鍏宠仈琛�
*/
for (WaveItem item : waveItems) {
- List<AsnOrderItem> items = orderItems.stream()
+ List<WkOrderItem> items = orderItems.stream()
.filter(orderItem -> item.getMatnrId()
.equals(orderItem.getMatnrId()))
.collect(Collectors.toList());
@@ -485,11 +485,11 @@
List<LocItem> locItems = new ArrayList<>();
LocItem locItem = locItemService.getById(param.getId());
- AsnOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, outId)
- .eq(StringUtils.isNotBlank(locItem.getBatch()), AsnOrderItem::getSplrBatch, locItem.getBatch())
- .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), AsnOrderItem::getFieldsIndex, locItem.getFieldsIndex())
- .eq(AsnOrderItem::getMatnrId, locItem.getMatnrId()));
+ WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, outId)
+ .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
+ .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
+ .eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
if (Objects.isNull(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -561,16 +561,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R cancelOutOrderByItems(List<AsnOrderItem> orderItems) {
- Map<Long, List<AsnOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
+ public R cancelOutOrderByItems(List<WkOrderItem> orderItems) {
+ Map<Long, List<WkOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getAsnId));
for (Long key : listMap.keySet()) {
WkOrder order = this.getById(key);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = listMap.get(key);
+ List<WkOrderItem> items = listMap.get(key);
if (!items.isEmpty()) {
- for (AsnOrderItem orderItem : items) {
+ for (WkOrderItem orderItem : items) {
DeliveryItem deliveryItem = deliveryItemService.getById(orderItem.getPoDetlId());
Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 10000) / 10000.0;
deliveryItem.setWorkQty(workQty.compareTo(0.0) >= 0 ? workQty : 0);
@@ -592,8 +592,8 @@
if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, key))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
- if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, key))) {
+ if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, key))) {
throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
@@ -602,24 +602,24 @@
private List<OrderOutItemDto> getOutOrderList(Long orderId, WaveRule waveRule) {
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnId, orderId));
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnId, orderId));
List<OrderOutItemDto> list = new ArrayList<>();
Set<ExistDto> existDtos = new HashSet<>();
- for (AsnOrderItem asnOrderItem : asnOrderItems) {
- BigDecimal issued = new BigDecimal(asnOrderItem.getAnfme().toString())
- .subtract(new BigDecimal(asnOrderItem.getWorkQty().toString())
+ for (WkOrderItem wkOrderItem : wkOrderItems) {
+ BigDecimal issued = new BigDecimal(wkOrderItem.getAnfme().toString())
+ .subtract(new BigDecimal(wkOrderItem.getWorkQty().toString())
);
if (issued.doubleValue() <= 0) {
continue;
}
List<LocItem> locItems = new ArrayList<>();
if (WaveRuleType.Efficiency_First.type.equals(waveRule.getType())) {
- locItems = LocManageUtil.getEfficiencyFirstItemList(asnOrderItem.getMatnrCode(), asnOrderItem.getSplrBatch(), asnOrderItem.getAnfme());
+ locItems = LocManageUtil.getEfficiencyFirstItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
} else if (WaveRuleType.First_In_First_Out.type.equals(waveRule.getType())) {
- locItems = LocManageUtil.getFirstInFirstOutItemList(asnOrderItem.getMatnrCode(), asnOrderItem.getSplrBatch(), asnOrderItem.getAnfme());
+ locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
} else {
- locItems = LocManageUtil.getFirstInFirstOutItemList(asnOrderItem.getMatnrCode(), asnOrderItem.getSplrBatch(), asnOrderItem.getAnfme());
+ locItems = LocManageUtil.getFirstInFirstOutItemList(wkOrderItem.getMatnrCode(), wkOrderItem.getSplrBatch(), wkOrderItem.getAnfme());
}
for (LocItem locItem : locItems) {
Loc loc = locService.getById(locItem.getLocId());
@@ -660,13 +660,13 @@
if (issued.doubleValue() > 0) {
LocItem locItem = new LocItem()
.setId(new Random().nextLong())
- .setMatnrCode(asnOrderItem.getMatnrCode())
- .setMaktx(asnOrderItem.getMaktx())
+ .setMatnrCode(wkOrderItem.getMatnrCode())
+ .setMaktx(wkOrderItem.getMaktx())
.setAnfme(0.00)
.setWorkQty(issued.doubleValue())
.setOutQty(issued.doubleValue())
- .setUnit(asnOrderItem.getStockUnit())
- .setBatch(asnOrderItem.getSplrBatch());
+ .setUnit(wkOrderItem.getStockUnit())
+ .setBatch(wkOrderItem.getSplrBatch());
OrderOutItemDto orderOutItemDto = new OrderOutItemDto();
orderOutItemDto.setLocItem(locItem);
list.add(orderOutItemDto);
@@ -685,7 +685,7 @@
* @description 鍚堝苟鐢熸垚娉㈡
* @time 2025/4/25 10:07
*/
- private List<WaveItem> mergeWave(List<AsnOrderItem> orderItems, Wave wave) {
+ private List<WaveItem> mergeWave(List<WkOrderItem> orderItems, Wave wave) {
List<WaveItem> items = new ArrayList<>();
orderItems.forEach(order -> {
Double anfme = Math.round((order.getAnfme() - order.getWorkQty()) * 10000) / 10000.0;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
index 409f37e..a956871 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
@@ -44,7 +44,7 @@
private WarehouseAreasItemService warehouseAreasItemService;
@Override
- public List<AsnOrderItem> listByAsn(Map<String, Object> map) {
+ public List<WkOrderItem> listByAsn(Map<String, Object> map) {
if (Objects.isNull(map.get("asnCode"))) {
throw new CoolException("鏀惰揣鍗曟嵁鏄庣粏缂栫爜涓嶈兘涓虹┖锛侊紒");
}
@@ -54,13 +54,13 @@
if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, map.get("asnCode"))
- .eq(AsnOrderItem::getNtyStatus, 1));
- if (asnOrderItems.isEmpty()) {
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnCode, map.get("asnCode"))
+ .eq(WkOrderItem::getNtyStatus, 1));
+ if (wkOrderItems.isEmpty()) {
return new ArrayList<>();
}
- return asnOrderItems;
+ return wkOrderItems;
}
@Override
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index 8eca471..ccf2f5b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -160,10 +160,10 @@
Double safeQty = Objects.isNull(item.getSafeQty()) ? 0 : item.getSafeQty();
Double sum = disQty + safeQty;
- AsnOrderItem asnOrderItem = asnOrderItemService.getById(item.getAsnItemId());
- if (Objects.isNull(asnOrderItem)) {
- if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) {
- Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, asnOrderItem.getSplrCode()));
+ WkOrderItem wkOrderItem = asnOrderItemService.getById(item.getAsnItemId());
+ if (Objects.isNull(wkOrderItem)) {
+ if (StringUtils.isNoneBlank(wkOrderItem.getSplrCode())) {
+ Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, wkOrderItem.getSplrCode()));
orderItem.setSplrId(companys.getId());
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index a7c8e9a..15dd000 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -842,7 +842,7 @@
throw new CoolException("鍘熷崟鎹姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
- AsnOrderItem orderItem = outStockItemService.getById(item.getSource());
+ WkOrderItem orderItem = outStockItemService.getById(item.getSource());
if (Objects.isNull(orderItem)) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗗凡涓嶅瓨鍦紒锛�");
}
@@ -1063,7 +1063,7 @@
throw new CoolException(e.getMessage());
}
} else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)) {
- AsnOrderItem orderItem = asnOrderItemService.getById(key);
+ WkOrderItem orderItem = asnOrderItemService.getById(key);
if (Objects.isNull(orderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -1125,7 +1125,7 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public void saveOutStockItem(List<TaskItem> taskItems, AsnOrderItem orderItem, WaveItem waveItem, Long loginUserId) throws Exception {
+ public void saveOutStockItem(List<TaskItem> taskItems, WkOrderItem orderItem, WaveItem waveItem, Long loginUserId) throws Exception {
Stock stock = new Stock();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
if (StringUtils.isBlank(ruleCode)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java
index 9cc366f..c4b55a2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java
@@ -2,11 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.mapper.WaveOrderRelaMapper;
import com.vincent.rsf.server.manager.entity.WaveOrderRela;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -34,8 +33,8 @@
return R.ok();
}
List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList());
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> wrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
wrapper.in("id", orderIds);
return R.ok().add(asnOrderItemService.page(pageParam, wrapper));
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index 7775588..b833343 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -242,7 +242,7 @@
}
List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, orderIds));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, orderIds));
orderItems.forEach(asnOrderItem -> {
asnOrderItem.setWorkQty(0.0);
if (!asnOrderItemService.updateById(asnOrderItem)) {
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 4064a76..febda31 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -71,7 +71,7 @@
) t
${ew.customSqlSegment}
</select>
- <select id="resultById" resultType="com.vincent.rsf.server.manager.entity.AsnOrderItem">
+ <select id="resultById" resultType="com.vincent.rsf.server.manager.entity.WkOrderItem">
SELECT
*
FROM
--
Gitblit v1.9.1