From ffa9b04fbb25726c77458da5607c1b43bdd62603 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:25:46 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 44 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 33 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 51 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 25 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 58 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 14
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderMapper.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderMapper.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 53 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 20 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 26 +-
rsf-admin/src/i18n/zh.js | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/QlyInspectService.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java | 48 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 16
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java | 5
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderAndItemsParams.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 20 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 14
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java | 6
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 24 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 8
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java | 15
33 files changed, 253 insertions(+), 291 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index ccda278..ab9b188 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -636,7 +636,7 @@
code: "鐩樼偣鍗曞彿",
poCode: "DO鍗曞彿",
poId: "DO鏍囪瘑",
- type: "绫诲瀷",
+ type: "鍗曟嵁绫诲瀷",
checkType: '鐩樼偣绫诲瀷',
wkType: "涓氬姟绫诲瀷",
anfme: "鏁伴噺",
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
index 16a5e11..d372ae8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
@@ -4,7 +4,6 @@
import com.vincent.rsf.server.api.controller.params.OrderParams;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.utils.ExcelUtil;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index a1169d0..d3de1b1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -3,7 +3,7 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.system.controller.param.LoginParam;
@@ -30,7 +30,7 @@
R otherReceipt(OtherReceiptParams params);
- List<AsnOrder> getAllAsnOrders();
+ List<WkOrder> getAllAsnOrders();
R getReceiptAreas();
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 9e39313..299b122 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
@@ -231,16 +231,16 @@
String asnCode = receipts.stream().findFirst().get().getAsnCode();
- AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getCode, asnCode));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, asnCode));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
- Double rcptedQty = Math.round((asnOrder.getQty() + receiptQty) * 10000) / 10000.0;
+ Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 10000) / 10000.0;
- asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
- if (!asnOrderMapper.updateById(asnOrder)) {
+ wkOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ if (!asnOrderMapper.updateById(wkOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
@@ -333,11 +333,11 @@
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
/**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
- extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
+ extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
}
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
if (!asnOrderMapper.updateById(order)) {
@@ -348,7 +348,7 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
- private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
Companys companys = new Companys();
if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
@@ -360,8 +360,8 @@
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
.setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
+ .setAsnCode(wkOrder.getCode())
+ .setAsnId(wkOrder.getId())
.setProdTime(dto.getProdTime())
.setSplrId(companys.getId())
.setWeight(dto.getWeigth())
@@ -445,9 +445,9 @@
List<Short> shorts = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE
.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .notIn(AsnOrder::getExceStatus, shorts)
- .eq(AsnOrder::getCode, params.getAsnCode()));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .notIn(WkOrder::getExceStatus, shorts)
+ .eq(WkOrder::getCode, params.getAsnCode()));
if (Objects.isNull(order)) {
throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
}
@@ -481,9 +481,9 @@
* @description 鑾峰彇鎵�鏈夐�氱煡鍗�
*/
@Override
- public List<AsnOrder> getAllAsnOrders() {
- List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
- return asnOrders;
+ public List<WkOrder> getAllAsnOrders() {
+ List<WkOrder> wkOrders = asnOrderMapper.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
+ return wkOrders;
}
/**
@@ -572,12 +572,12 @@
*/
@Override
public R inspect(String code, Long loginUserId) {
- AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code));
- if (Objects.isNull(asnOrders)) {
+ WkOrder wkOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, code));
+ if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
InspectDetlDto detlDto = new InspectDetlDto();
- detlDto.setCode(asnOrders.getCode()).setId(asnOrders.getId()).setPoCode(asnOrders.getPoCode());
+ detlDto.setCode(wkOrders.getCode()).setId(wkOrders.getId()).setPoCode(wkOrders.getPoCode());
List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
@@ -600,7 +600,7 @@
detlDto.setItems(itemDtos);
}
- List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, asnOrders.getId()));
+ List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, wkOrders.getId()));
detlDto.setHistories(histories);
return R.ok(detlDto);
}
@@ -617,12 +617,12 @@
if (org.apache.commons.lang3.StringUtils.isBlank(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder asnOrder = asnOrderMapper.getById(id);
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getById(id);
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<AsnOrder> orders = new ArrayList<>();
- orders.add(asnOrder);
+ List<WkOrder> orders = new ArrayList<>();
+ orders.add(wkOrder);
if (asnOrderMapper.notifyInspect(orders)) {
return R.ok("涓婃姤鎴愬姛锛侊紒");
} else {
@@ -743,10 +743,10 @@
}
Long OrderId = params.getItemList().stream().findFirst().get().getAsnId();
/**鑾峰彇骞冲簱璁㈠崟*/
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, OrderId)
- .eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
- .eq(AsnOrder::getType, OrderType.ORDER_IN.type));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getId, OrderId)
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type));
if (Objects.isNull(order)) {
throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
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 056c630..0cd9636 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
@@ -9,9 +9,7 @@
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.TaskResouceType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.WaveExceStatus;
import com.vincent.rsf.server.manager.service.*;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
@@ -123,10 +121,10 @@
}
List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
ArrayList<AsnOrderItem> list = new ArrayList<>();
- List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
- for (AsnOrder asnOrder : asnOrderList) {
+ 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, asnOrder.getId())
+ .eq(AsnOrderItem::getAsnId, wkOrder.getId())
.eq(AsnOrderItem::getMatnrCode, taskItem.getMatnrCode())
.eq(AsnOrderItem::getSplrBatch, taskItem.getBatch())
);
@@ -176,12 +174,12 @@
if (num.compareTo(orderDemandQty) < 0){
throw new CoolException("鎾鏁伴噺澶т簬鍗曟嵁鍑哄簱鏁伴噺锛岃妫�鏌�");
}
- AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
- if (Cools.isEmpty(asnOrder)){
+ WkOrder wkOrder = asnOrderService.getById(orderItem.getAsnId());
+ if (Cools.isEmpty(wkOrder)){
throw new CoolException("鍑哄簱鍗曚富鍗曟湭鎵惧埌");
}
- asnOrder.setQty(new BigDecimal(asnOrder.getQty().toString()).add(orderDemandQty).doubleValue());
- if (!asnOrderService.updateById(asnOrder)){
+ wkOrder.setQty(new BigDecimal(wkOrder.getQty().toString()).add(orderDemandQty).doubleValue());
+ if (!asnOrderService.updateById(wkOrder)){
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
}
orderItem.setQty(new BigDecimal(orderItem.getQty().toString()).add(orderDemandQty).doubleValue());
@@ -191,8 +189,8 @@
//妫�鏌ュ崟鎹槸鍚﹀畬鎴�
Boolean orderChecked = checkOrderComplete(orderItem);
if (orderChecked){
- asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
- if (!asnOrderService.updateById(asnOrder)){
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!asnOrderService.updateById(wkOrder)){
throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
}
}
@@ -225,8 +223,8 @@
private Boolean checkWaveComplete(TaskItem taskItem) {
Wave wave = waveService.getById(taskItem.getSourceId());
- List<AsnOrder> asnOrderList = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWaveId, wave.getId()));
- return asnOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
+ List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWaveId, wave.getId()));
+ return wkOrderList.stream().allMatch(item -> new BigDecimal(item.getAnfme().toString()).equals(new BigDecimal(item.getQty().toString())));
}
private Boolean checkOrderComplete(AsnOrderItem orderItem) {
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 0a0ad7a..b65b741 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
@@ -11,7 +11,7 @@
import com.vincent.rsf.server.api.entity.params.ErpInspectItem;
import com.vincent.rsf.server.api.entity.params.ErpInspectParams;
import com.vincent.rsf.server.api.service.ReportMsgService;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -149,13 +149,13 @@
//ASN鏄庣粏鍗曟嵁鍒嗙粍
Map<Long, List<AsnOrderItem>> asnIds = asnOrderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
ids.forEach(id -> {
- int count = asnOrderService.count(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, id));
+ int count = asnOrderService.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id));
if (count == asnIds.get(id).size()) {
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getNtyStatus, 1))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1))) {
throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
} else {
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getNtyStatus, 2))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 2))) {
throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
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 24fc8af..99b86d6 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
@@ -7,9 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.Purchase;
-import com.vincent.rsf.server.manager.entity.PurchaseItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -19,11 +17,8 @@
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.AsnOrder;
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.enums.POExceStatus;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;
@@ -40,7 +35,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
-import java.util.stream.Collectors;
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
@@ -59,8 +53,8 @@
@PostMapping("/asnOrder/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
queryWrapper.in("type", asList);
return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
@@ -89,30 +83,30 @@
@OperationLog("Create ASN鍗曟嵁")
@PostMapping("/asnOrder/save")
@ApiOperation("淇濆瓨")
- public R save(@RequestBody AsnOrder asnOrder) {
- asnOrder.setCreateBy(getLoginUserId());
- asnOrder.setUpdateBy(getLoginUserId());
- String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, asnOrder);
+ public R save(@RequestBody WkOrder wkOrder) {
+ wkOrder.setCreateBy(getLoginUserId());
+ wkOrder.setUpdateBy(getLoginUserId());
+ String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, wkOrder);
if (!Objects.isNull(code)) {
- asnOrder.setCode(code);
+ wkOrder.setCode(code);
}
- if (!asnOrderService.save(asnOrder)) {
+ if (!asnOrderService.save(wkOrder)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(asnOrder);
+ return R.ok("Save Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@OperationLog("Update ASN鍗曟嵁")
@PostMapping("/asnOrder/update")
@ApiOperation("鏇存柊")
- public R update(@RequestBody AsnOrder asnOrder) {
- asnOrder.setUpdateBy(getLoginUserId());
- asnOrder.setUpdateTime(new Date());
- if (!asnOrderService.updateById(asnOrder)) {
+ public R update(@RequestBody WkOrder wkOrder) {
+ wkOrder.setUpdateBy(getLoginUserId());
+ wkOrder.setUpdateTime(new Date());
+ if (!asnOrderService.updateById(wkOrder)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrder);
+ return R.ok("Update Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@@ -131,9 +125,9 @@
@ApiOperation("鏌ヨ")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getCode, condition);
+ wrapper.like(WkOrder::getCode, condition);
}
asnOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -145,11 +139,11 @@
@PostMapping("/asnOrder/export")
@ApiOperation("瀵煎嚭")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrder> orders = new ArrayList<>();
+ List<WkOrder> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
if (!ids.isEmpty()) {
- orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
+ orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
} else {
orders = asnOrderService.list(new LambdaQueryWrapper<>());
}
@@ -157,7 +151,7 @@
orders = asnOrderService.list();
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
- for (AsnOrder order : orders) {
+ for (WkOrder order : orders) {
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
for (AsnOrderItem item : orderItems) {
if (Objects.isNull(item)) {
@@ -191,7 +185,7 @@
@PostMapping("/asnOrder/inspect")
@ApiOperation("璐ㄦ涓婃姤")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- public R notifyInspect(@RequestBody List<AsnOrder> orders) {
+ public R notifyInspect(@RequestBody List<WkOrder> orders) {
if (orders.isEmpty()) {
return R.error("涓婃姤鍗曟嵁涓嶈兘涓虹┖!!");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
index 4bd9745..3ba06c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
@@ -11,7 +11,6 @@
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.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
import com.vincent.rsf.server.system.controller.BaseController;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index b6133ac..06f336b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -11,7 +11,7 @@
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.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -38,8 +38,8 @@
@PostMapping("/check/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- QueryWrapper<AsnOrder> wrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> wrapper = pageParam.buildWrapper(true);
wrapper.eq("type", OrderType.ORDER_CHECK.type);
return R.ok().add(checkOrderService.page(pageParam, wrapper));
}
@@ -65,7 +65,7 @@
@PreAuthorize("hasAuthority('manager:check:save')")
@OperationLog("Create 瀛楀吀鏁版嵁闆�")
@PostMapping("/check/save")
- public R save(@RequestBody AsnOrder order) {
+ public R save(@RequestBody WkOrder order) {
order.setType(OrderType.ORDER_CHECK.type);
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, order);
if (Objects.isNull(ruleCode)) {
@@ -80,7 +80,7 @@
@PreAuthorize("hasAuthority('manager:check:update')")
@OperationLog("Update 瀛楀吀鏁版嵁闆�")
@PostMapping("/check/update")
- public R update(@RequestBody AsnOrder order) {
+ public R update(@RequestBody WkOrder order) {
order.setUpdateTime(null);
order.setUpdateBy(getLoginUserId());
if (!checkOrderService.updateById(order)) {
@@ -103,9 +103,9 @@
@PostMapping("/check/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getCode, condition);
+ wrapper.like(WkOrder::getCode, condition);
}
checkOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -116,13 +116,13 @@
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/check/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrder> orders = new ArrayList<>();
+ List<WkOrder> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orders = checkOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, map.get("ids")));
+ orders = checkOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, map.get("ids")));
} else {
orders = checkOrderService.list();
}
- ExcelUtil.build(ExcelUtil.create(orders, AsnOrder.class), response);
+ ExcelUtil.build(ExcelUtil.create(orders, WkOrder.class), response);
}
@PostMapping("/check/items/save")
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 b20c0a4..833bb08 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
@@ -13,7 +13,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.DeliveryItem;
-import com.vincent.rsf.server.manager.entity.excel.OutStockTemplate;
+import com.vincent.rsf.server.manager.entity.WkOrder;
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 +22,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.AsnOrder;
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;
@@ -57,8 +56,8 @@
@PostMapping("/outStock/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
queryWrapper.in("type", list);
return R.ok().add(outStockService.page(pageParam, queryWrapper));
@@ -68,8 +67,8 @@
@PostMapping("/outStock/dialog/page")
public R dialogPage(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);
- QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);
+ PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
+ QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
queryWrapper.in("type", list);
return R.ok().add(outStockService.page(pageParam, queryWrapper));
@@ -78,7 +77,7 @@
@PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping("/outStock/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(outStockService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getType, OrderType.ORDER_OUT.type)));
+ return R.ok().add(outStockService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getType, OrderType.ORDER_OUT.type)));
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -98,39 +97,39 @@
@OperationLog("Create 鍑哄簱鍗曟嵁")
@PostMapping("/outStock/save")
@ApiOperation("淇濆瓨")
- public R save(@RequestBody AsnOrder asnOrder) {
- asnOrder.setCreateBy(getLoginUserId())
+ public R save(@RequestBody WkOrder wkOrder) {
+ wkOrder.setCreateBy(getLoginUserId())
.setUpdateBy(getLoginUserId());
- if (Objects.isNull(asnOrder.getCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, asnOrder);
+ if (Objects.isNull(wkOrder.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, wkOrder);
if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
return R.error("缂栫爜瑙勫垯閿欒锛氱紪鐮併�孲YS_OUT_STOCK_CODE銆嶆槸鏈缃垚鍔燂紒锛�");
}
- asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
.setCode(ruleCode);
}
- if (!outStockService.save(asnOrder)) {
+ if (!outStockService.save(wkOrder)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(asnOrder);
+ return R.ok("Save Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:outStock:update')")
@OperationLog("Update 锛涘嚭搴撳崟鎹�")
@PostMapping("/outStock/update")
@ApiOperation("鏇存柊")
- public R update(@RequestBody AsnOrder asnOrder) {
- asnOrder.setType(OrderType.ORDER_OUT.type)
+ public R update(@RequestBody WkOrder wkOrder) {
+ wkOrder.setType(OrderType.ORDER_OUT.type)
.setUpdateBy(getLoginUserId())
.setUpdateTime(new Date());
- if (Objects.isNull(asnOrder.getCode())) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, asnOrder);
- asnOrder.setCode(ruleCode);
+ if (Objects.isNull(wkOrder.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, wkOrder);
+ wkOrder.setCode(ruleCode);
}
- if (!outStockService.updateById(asnOrder)) {
+ if (!outStockService.updateById(wkOrder)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(asnOrder);
+ return R.ok("Update Success").add(wkOrder);
}
@PreAuthorize("hasAuthority('manager:outStock:remove')")
@@ -148,9 +147,9 @@
@ApiOperation("鏌ヨ")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
- LambdaQueryWrapper<AsnOrder> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<WkOrder> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(AsnOrder::getCode, condition);
+ wrapper.like(WkOrder::getCode, condition);
}
outStockService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
@@ -188,11 +187,11 @@
@PostMapping("/outStock/export")
@ApiOperation("瀵煎嚭")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<AsnOrder> orders = new ArrayList<>();
+ List<WkOrder> orders = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
if (!ids.isEmpty()) {
- orders = outStockService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, ids));
+ orders = outStockService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
} else {
orders = outStockService.list(new LambdaQueryWrapper<>());
}
@@ -200,7 +199,7 @@
orders = outStockService.list();
}
List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
- for (AsnOrder order : orders) {
+ for (WkOrder order : orders) {
List<AsnOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
for (AsnOrderItem item : orderItems) {
if (Objects.isNull(item)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderAndItemsParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderAndItemsParams.java
index 411eade..5e5703f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderAndItemsParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/AsnOrderAndItemsParams.java
@@ -1,6 +1,6 @@
package com.vincent.rsf.server.manager.controller.params;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +21,7 @@
public class AsnOrderAndItemsParams implements Serializable {
@ApiModelProperty("涓诲崟淇℃伅")
- private AsnOrder orders;
+ private WkOrder orders;
@ApiModelProperty("鏄庣粏")
private List<Map<String, Object>> items;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java
index 6e165d2..ce4fb95 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/BatchUpdateParam.java
@@ -1,8 +1,6 @@
package com.vincent.rsf.server.manager.controller.params;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
-import io.swagger.annotations.Api;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +15,7 @@
public class BatchUpdateParam implements Serializable {
@ApiModelProperty("淇敼鍙傛暟")
- private AsnOrder order;
+ private WkOrder order;
@ApiModelProperty("ids")
private List<Long> ids;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
similarity index 95%
rename from rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index 91ee28e..2b5f9c3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -19,7 +19,6 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -27,12 +26,11 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
@Data
@Accessors(chain = true)
@TableName("man_asn_order")
-public class AsnOrder implements Serializable {
+public class WkOrder implements Serializable {
private static final long serialVersionUID = 1L;
@@ -173,9 +171,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public AsnOrder() {}
+ public WkOrder() {}
- public AsnOrder(String code,String poCode,Long poId,String type,String wkType,Double anfme,Double qty,String logisNo,Date arrTime,Short rleStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty, String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
this.poCode = poCode;
this.poId = poId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderMapper.java
index 7c93cec..26f2ad2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/AsnOrderMapper.java
@@ -1,12 +1,12 @@
package com.vincent.rsf.server.manager.mapper;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface AsnOrderMapper extends BaseMapper<AsnOrder> {
+public interface AsnOrderMapper extends BaseMapper<WkOrder> {
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderMapper.java
index 24bbb88..9aae9c2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/CheckOrderMapper.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.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
-public interface CheckOrderMapper extends BaseMapper<AsnOrder> {
+public interface CheckOrderMapper extends BaseMapper<WkOrder> {
}
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 b861b6d..919628f 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
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
@@ -54,13 +54,13 @@
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog() {
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getType, OrderType.ORDER_IN.type)
- .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
- if (asnOrders.isEmpty()) {
+ List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
+ if (wkOrders.isEmpty()) {
return;
}
- moveOrderToLog(asnOrders, OrderType.ORDER_IN.type);
+ moveOrderToLog(wkOrders, OrderType.ORDER_IN.type);
}
@@ -74,14 +74,14 @@
// @Scheduled(cron = "0/30 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void outStockComplete() {
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getType, OrderType.ORDER_OUT.type)
+ List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
.apply("anfme = work_qty")
);
- if (asnOrders.isEmpty()) {
+ if (wkOrders.isEmpty()) {
return;
}
- moveOrderToLog(asnOrders, OrderType.ORDER_OUT.type);
+ moveOrderToLog(wkOrders, OrderType.ORDER_OUT.type);
}
/**
@@ -92,14 +92,14 @@
* @description 娣诲姞鍘嗗彶鍗曟嵁
* @time 2025/6/16 08:56
*/
- private void moveOrderToLog(List<AsnOrder> asnOrders, String type) {
- Set<Long> longSet = asnOrders.stream().map(AsnOrder::getId).collect(Collectors.toSet());
+ 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));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
- for (AsnOrder order : asnOrders) {
+ for (WkOrder order : wkOrders) {
AsnOrderLog orderLog = new AsnOrderLog();
if (type.equals(OrderType.ORDER_OUT.type)) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
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 81b7147..b74f20f 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
@@ -4,15 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
import com.vincent.rsf.server.common.config.SysStockProperties;
-import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.DateUtils;
-import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.POExceStatus;
-import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.enums.WarehouseAreasType;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.WarehouseAreasItemServiceImpl;
@@ -33,7 +29,6 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
-import java.util.stream.Collectors;
/**
* @author Ryan
@@ -83,9 +78,9 @@
if (!Boolean.parseBoolean(config.getVal())) {
return;
}
- List<AsnOrder> orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
+ List<WkOrder> orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
if (!orders.isEmpty()) {
- for (AsnOrder order : orders) {
+ for (WkOrder order : orders) {
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
if (orderItems.isEmpty()) {
return;
@@ -120,10 +115,10 @@
// throw new CoolException("鏀惰揣鍗曚繚瀛樿嚦鏀惰揣鍖烘墽琛屽け璐ワ紒锛�");
// }
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getQty, order.getAnfme())
- .set(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
- .eq(AsnOrder::getId, order.getId()))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getQty, order.getAnfme())
+ .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
+ .eq(WkOrder::getId, order.getId()))) {
throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -137,7 +132,7 @@
* @description: 鏀惰揣鍖哄簱瀛樻洿鏂�
* @version 1.0
*/
- private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ private void extracted(WarehouseAreas areasItem, AsnOrderItem 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()));
@@ -148,8 +143,8 @@
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
.setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
+ .setAsnCode(wkOrder.getCode())
+ .setAsnId(wkOrder.getId())
.setProdTime(orderItem.getProdTime())
.setPlatItemId(orderItem.getPlatItemId())
.setPlatOrderCode(orderItem.getPlatOrderCode())
@@ -224,7 +219,7 @@
if (items.isEmpty()) {
throw new CoolException("瀛愬垪琛ㄦ暟鎹负绌猴紝璇锋煡璇O鍗曟槸鍚︽纭綍鍏ワ紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
//鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
order.setAnfme(purchase.getAnfme())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java
index 7258d1e..2a0752f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemLogService.java
@@ -1,10 +1,7 @@
package com.vincent.rsf.server.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
-
-import java.util.List;
public interface AsnOrderItemLogService extends IService<AsnOrderItemLog> {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
index 6a9eb9b..641902a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderService.java
@@ -4,16 +4,16 @@
import com.vincent.rsf.framework.common.R;
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.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import java.util.List;
import java.util.Map;
-public interface AsnOrderService extends IService<AsnOrder> {
+public interface AsnOrderService extends IService<WkOrder> {
- boolean notifyInspect(List<AsnOrder> orders);
+ boolean notifyInspect(List<WkOrder> orders);
- List<AsnOrder> getListByMatnr(Map<String, String> params);
+ List<WkOrder> getListByMatnr(Map<String, String> params);
R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) throws Exception;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java
index c847096..bf3fe9d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CheckOrderService.java
@@ -3,12 +3,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
-public interface CheckOrderService extends IService<AsnOrder> {
+public interface CheckOrderService extends IService<WkOrder> {
R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId);
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 e078197..75e4644 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
@@ -6,14 +6,13 @@
import com.vincent.rsf.server.manager.controller.params.GenWaveParams;
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.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.DeliveryItem;
-import com.vincent.rsf.server.manager.entity.LocItem;
import java.util.List;
-public interface OutStockService extends IService<AsnOrder> {
+public interface OutStockService extends IService<WkOrder> {
R cancelOutOrder(String id);
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 f0de2ed..0a709cf 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,6 @@
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.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
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 d6660b4..4033ee4 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
@@ -10,14 +10,13 @@
import com.vincent.rsf.framework.common.Cools;
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.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-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.AsnOrder;
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;
@@ -31,7 +30,6 @@
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.DictDataService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
@@ -107,12 +105,12 @@
throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key));
if (!Objects.isNull(order)) {
sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�");
throw new CoolException(sbFaild.toString());
}
- order = new AsnOrder();
+ order = new WkOrder();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date date = dateFormat.parse(template.getArrTime());
if (Objects.isNull(date)) {
@@ -205,10 +203,10 @@
if (!items.isEmpty()) {
// double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum();
double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
- if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>()
+ if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>()
// .set(AsnOrder::getQty, qty)
- .set(AsnOrder::getAnfme, anfme)
- .eq(AsnOrder::getId, order.getId()))) {
+ .set(WkOrder::getAnfme, anfme)
+ .eq(WkOrder::getId, order.getId()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
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 3836921..13d4c7b 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
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
@@ -46,14 +46,14 @@
if (Objects.isNull(orderLog)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
BeanUtils.copyProperties(orderLog, order);
order.setId(orderLog.getAsnId())
.setDeleted(0)
.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
- AsnOrder asnOrder = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, orderLog.getCode()));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏀惰揣鍗曟嵁宸叉坊鍔狅紝鍒锋柊鍚庡啀鎿嶄綔锛侊紒");
}
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 576f97b..8096cb2 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
@@ -9,7 +9,6 @@
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.api.service.ReportMsgService;
-import com.vincent.rsf.server.common.utils.DateUtils;
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.*;
@@ -39,7 +38,7 @@
* @time 2025/3/7 08:02
*/
@Service("asnOrderService")
-public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements AsnOrderService {
+public class AsnOrderServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements AsnOrderService {
@Autowired
private ReceiveMsgService receiveMsgService;
@@ -62,11 +61,11 @@
private PurchaseItemService purchaseItemService;
@Override
- public boolean notifyInspect(List<AsnOrder> orders) {
+ public boolean notifyInspect(List<WkOrder> orders) {
if (orders.isEmpty()) {
throw new CoolException("涓婃姤鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- Set<Long> asnIds = orders.stream().map(AsnOrder::getId).collect(Collectors.toSet());
+ Set<Long> asnIds = orders.stream().map(WkOrder::getId).collect(Collectors.toSet());
if (asnIds.isEmpty()) {
throw new CoolException("ASN鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
@@ -82,7 +81,7 @@
}
@Override
- public List<AsnOrder> getListByMatnr(Map<String, String> params) {
+ public List<WkOrder> getListByMatnr(Map<String, String> params) {
if (Objects.isNull(params)) {
throw new CoolException("鏌ヨ鏉′欢涓嶈兘涓虹┖锛侊紒");
}
@@ -103,7 +102,7 @@
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("鍗曟嵁涓嶈兘涓虹┖锛侊紒");
}
@@ -137,7 +136,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
@@ -165,7 +164,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
@@ -194,18 +193,18 @@
*/
@Override
public boolean batchUpdate(BatchUpdateParam params, Long userId) {
- AsnOrder order = params.getOrder();
+ WkOrder order = params.getOrder();
if (Objects.isNull(order)) {
throw new CoolException("淇敼鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return this.update(new LambdaUpdateWrapper<AsnOrder>()
- .in(AsnOrder::getId, params.getIds())
- .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
- .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
- .set(!Objects.isNull(order.getStatus()), AsnOrder::getStatus, order.getStatus())
- .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
- .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
- .set(AsnOrder::getUpdateBy, userId));
+ return this.update(new LambdaUpdateWrapper<WkOrder>()
+ .in(WkOrder::getId, params.getIds())
+ .set(!Objects.isNull(order.getRleStatus()), WkOrder::getRleStatus, order.getRleStatus())
+ .set(!Objects.isNull(order.getNtyStatus()), WkOrder::getNtyStatus, order.getNtyStatus())
+ .set(!Objects.isNull(order.getStatus()), WkOrder::getStatus, order.getStatus())
+ .set(!Objects.isNull(order.getWkType()), WkOrder::getWkType, order.getWkType())
+ .set(!Objects.isNull(order.getExceStatus()), WkOrder::getExceStatus, order.getExceStatus())
+ .set(WkOrder::getUpdateBy, userId));
}
/**
@@ -219,13 +218,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R completeOrder(Long id, Long loginUserId) {
- AsnOrder asnOrder = this.getById(id);
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = this.getById(id);
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦�!!");
}
//涓�閿姞鍏ュ巻鍙叉。
try {
- operateOrderLogs(asnOrder);
+ operateOrderLogs(wkOrder);
} catch (Exception e) {
throw new CoolException("鏀惰揣瀹屾垚澶辫触锛侊紒");
}
@@ -235,7 +234,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R closeOrder(Long id) {
- AsnOrder order = this.getById(id);
+ WkOrder order = this.getById(id);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -265,7 +264,7 @@
if (Objects.isNull(purchase)) {
throw new CoolException("PO鍗曟嵁涓嶅瓨鍦紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
//鏍规嵁缂栫爜瑙勫垯鐢熸垚ASN鍗曞彿
String code = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, purchase);
order.setCode(code)
@@ -387,9 +386,9 @@
}
}
- if (!this.remove(new LambdaQueryWrapper<AsnOrder>()
- .in(AsnOrder::getId, ids)
- .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>()
+ .in(WkOrder::getId, ids)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val))) {
throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
}
@@ -410,7 +409,7 @@
* @time 2025/3/19 19:53
*/
@Transactional(rollbackFor = Exception.class)
- public synchronized void operateOrderLogs(AsnOrder asrder) throws Exception {
+ public synchronized void operateOrderLogs(WkOrder asrder) throws Exception {
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -426,7 +425,7 @@
// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
// }
- AsnOrder order = this.getById(asrder.getId());
+ WkOrder order = this.getById(asrder.getId());
AsnOrderLog orderLog = new AsnOrderLog();
// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
BeanUtils.copyProperties(order, orderLog);
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 6c3fd66..ce7a1ca 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
@@ -9,7 +9,7 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
@@ -34,7 +34,7 @@
import java.util.stream.Collectors;
@Service("checkOrderService")
-public class CheckOrderServiceImpl extends ServiceImpl<CheckOrderMapper, AsnOrder> implements CheckOrderService {
+public class CheckOrderServiceImpl extends ServiceImpl<CheckOrderMapper, WkOrder> implements CheckOrderService {
@Autowired
private MatnrService matnrService;
@@ -65,11 +65,11 @@
Map<String, List<CheckOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(CheckOrderTemplate::getCode));
for (String key : listMap.keySet()) {
CheckOrderTemplate template = listMap.get(key).stream().findFirst().get();
- AsnOrder asnOrder = this.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
- if (!Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = this.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
+ if (!Objects.isNull(wkOrder)) {
continue;
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
order.setCode(template.getCode())
.setMemo(template.getMemo())
.setUpdateBy(loginUserId)
@@ -105,9 +105,9 @@
}
if (!items.isEmpty()) {
double purQty = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
- if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) {
+ 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()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
@@ -129,7 +129,7 @@
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (StringUtils.isBlank(orders.getWkType())) {
throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
@@ -167,7 +167,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 2889017..398e43d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -73,11 +73,11 @@
String siteNo = map.getSiteNo();
List<LocItem> items = map.getItems();
Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
- AsnOrder order;
+ WkOrder order;
Wave wave;
if (!Objects.isNull(map.getSourceId())) {
if (map.getType().equals(Constants.TASK_TYPE_WAVE_OUT_STOCK)) {
- order = new AsnOrder();
+ order = new WkOrder();
wave = waveService.getById(map.getSourceId());
} else {
wave = new Wave();
@@ -85,7 +85,7 @@
}
} else {
wave = new Wave();
- order = new AsnOrder();
+ order = new WkOrder();
}
listMap.keySet().forEach(key -> {
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 686c267..f9fa5dd 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
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.excel.OutStockTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -19,10 +20,8 @@
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.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
-import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.manager.service.OutStockItemService;
@@ -108,11 +107,11 @@
Map<String, List<OutStockTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(OutStockTemplate::getCode));
for (String key : listMap.keySet()) {
OutStockTemplate template = listMap.get(key).stream().findFirst().get();
- AsnOrder asnOrder = outStockService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
- if (!Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = outStockService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
+ if (!Objects.isNull(wkOrder)) {
continue;
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
order.setCode(template.getCode())
.setPoCode(template.getPoCode())
.setMemo(template.getMemo())
@@ -150,9 +149,9 @@
}
if (!items.isEmpty()) {
double purQty = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
- if (!outStockService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) {
+ 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()))) {
throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒");
}
}
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 ee4cf92..cc537cf 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
@@ -41,7 +41,7 @@
* @time 2025/3/7 08:02
*/
@Service("outStockServiceImpl")
-public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements OutStockService {
+public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements OutStockService {
public Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -87,7 +87,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
params.getItems().forEach(item -> {
item.put("asnId", orders.getId());
item.put("asnCode", orders.getCode());
@@ -121,7 +121,7 @@
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder order = this.getById(id);
+ WkOrder order = this.getById(id);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -152,7 +152,7 @@
}
}
- if (!this.remove(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, id))) {
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, id))) {
@@ -181,7 +181,7 @@
if (Objects.isNull(delivery)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
BeanUtils.copyProperties(delivery, order);
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, order);
if (StringUtils.isBlank(ruleCode)) {
@@ -280,14 +280,14 @@
if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .in(AsnOrder::getId, params.getIds()));
+ List<WkOrder> orders = this.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .in(WkOrder::getId, params.getIds()));
if (orders.isEmpty()) {
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷笉鑳芥墽琛屾尝娆＄敓鎴愭搷浣滐紒锛�");
}
- Double sum = orders.stream().mapToDouble(AsnOrder::getAnfme).sum();
- Double workQty = orders.stream().mapToDouble(AsnOrder::getWorkQty).sum();
+ Double sum = orders.stream().mapToDouble(WkOrder::getAnfme).sum();
+ Double workQty = orders.stream().mapToDouble(WkOrder::getWorkQty).sum();
Double anfme = Math.round((sum - workQty) * 10000) / 10000.0;
Wave wave = new Wave();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_TYPE, null);
@@ -303,7 +303,7 @@
throw new CoolException("娉㈡淇濆瓨澶辫触锛侊紒");
}
- List<Long> list = orders.stream().map(AsnOrder::getId).collect(Collectors.toList());
+ 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"));
@@ -352,13 +352,13 @@
if (!asnOrderItemService.saveOrUpdateBatch(orderItems)) {
throw new CoolException("鍑哄簱鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
}
- for (AsnOrder order : orders) {
+ for (WkOrder order : orders) {
Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 10000) / 10000.0;
- if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getWaveId, wave.getId())
- .set(AsnOrder::getWorkQty, wkQty)
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
- .eq(AsnOrder::getId, order.getId()))) {
+ if (!this.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getWaveId, wave.getId())
+ .set(WkOrder::getWorkQty, wkQty)
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WAVE.val)
+ .eq(WkOrder::getId, order.getId()))) {
throw new CoolException("鎵ц鐘舵�佷慨鏀逛慨鏀瑰け璐ワ紒锛�");
}
}
@@ -379,7 +379,7 @@
if (Objects.isNull(params.getOrders())) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖");
}
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (StringUtils.isBlank(orders.getWkType())) {
throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
@@ -417,7 +417,7 @@
*/
@Override
public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
- AsnOrder orders = params.getOrders();
+ WkOrder orders = params.getOrders();
if (Objects.isNull(orders)) {
throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒");
}
@@ -529,7 +529,7 @@
Double sum = Items.stream().mapToDouble(OutStockToTaskParams::getOutQty).sum();
//鏇存柊鍑哄簱鍗曟槑缁嗗強涓诲崟
- AsnOrder outOrder = outStockService.getById(outId);
+ WkOrder outOrder = outStockService.getById(outId);
if (Objects.isNull(outOrder)) {
throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -564,7 +564,7 @@
public R cancelOutOrderByItems(List<AsnOrderItem> orderItems) {
Map<Long, List<AsnOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
for (Long key : listMap.keySet()) {
- AsnOrder order = this.getById(key);
+ WkOrder order = this.getById(key);
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -589,7 +589,7 @@
}
}
- if (!this.remove(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, key))) {
+ if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, key))) {
throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
}
if (!outStockItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
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 bb134c6..409f37e 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
@@ -2,14 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
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.*;
-import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
import com.vincent.rsf.server.manager.mapper.QlyInspectMapper;
import com.vincent.rsf.server.manager.service.*;
@@ -51,10 +48,10 @@
if (Objects.isNull(map.get("asnCode"))) {
throw new CoolException("鏀惰揣鍗曟嵁鏄庣粏缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder asnOrder = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getCode, map.get("asnCode"))
- .ne(AsnOrder::getNtyStatus, 0));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, map.get("asnCode"))
+ .ne(WkOrder::getNtyStatus, 0));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
@@ -134,8 +131,8 @@
if (Objects.isNull(param.getIds()) || param.getIds().isEmpty()) {
throw new CoolException("鍗曟嵁ID涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, param.getIds()));
- if (asnOrders.isEmpty()) {
+ List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, param.getIds()));
+ if (wkOrders.isEmpty()) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
// List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, param.getIds()));
@@ -146,27 +143,27 @@
List<WarehouseAreasItem> orderItems = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>()
.in(WarehouseAreasItem::getAsnId, param.getIds()));
Map<Long, List<WarehouseAreasItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WarehouseAreasItem::getAsnId));
- for (AsnOrder asnOrder : asnOrders) {
+ for (WkOrder wkOrder : wkOrders) {
QlyInspect inspect = new QlyInspect();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_INSPECT_CODE, null);
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("绛栫暐閿欒锛氳妫�鏌ョ瓥鐣ャ��" + SerialRuleCode.SYS_INSPECT_CODE + "銆嶆槸鍚﹁缃纭紒锛�");
}
inspect.setCode(ruleCode)
- .setWkType(asnOrder.getWkType())
+ .setWkType(wkOrder.getWkType())
.setIsptStatus(QlyIsptStatus.QLY_ISPT_STAS_ING.val)
.setCreateBy(loginUserId)
- .setAsnId(asnOrder.getId())
- .setAsnCode(asnOrder.getCode());
+ .setAsnId(wkOrder.getId())
+ .setAsnCode(wkOrder.getCode());
/**鑾峰彇鍗曟嵁鏄庣粏*/
- List<WarehouseAreasItem> asnOrderItems = listMap.get(asnOrder.getId());
+ List<WarehouseAreasItem> asnOrderItems = listMap.get(wkOrder.getId());
if (Objects.isNull(asnOrderItems) || asnOrderItems.isEmpty()) {
continue;
}
double anfme = asnOrderItems.stream().mapToDouble(WarehouseAreasItem::getAnfme).sum();
inspect.setRcptQty(anfme);
if (!this.save(inspect)) {
- throw new CoolException("鍗曟嵁" + asnOrder.getCode() + "淇濆瓨澶辫触锛侊紒");
+ throw new CoolException("鍗曟嵁" + wkOrder.getCode() + "淇濆瓨澶辫触锛侊紒");
}
List<QlyIsptItem> items = new ArrayList<>();
for (WarehouseAreasItem orderItem : asnOrderItems) {
@@ -209,11 +206,11 @@
if (Objects.isNull(qlyInspect.getAsnCode()) || StringUtils.isBlank(qlyInspect.getAsnCode())) {
throw new CoolException("鏀惰揣鍗曞彿涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder asnOrder = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, qlyInspect.getAsnCode()));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, qlyInspect.getAsnCode()));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏀惰揣鍗曚笉瀛樺湪锛侊紒");
}
- qlyInspect.setAsnCode(asnOrder.getCode()).setAsnId(asnOrder.getId());
+ qlyInspect.setAsnCode(wkOrder.getCode()).setAsnId(wkOrder.getId());
return this.save(qlyInspect);
}
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 a1a1e4c..a7c8e9a 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
@@ -828,17 +828,17 @@
} else {
//鍑哄簱鍗曞嚭搴�
- AsnOrder asnOrder = outStockService.getById(item.getSourceId());
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = outStockService.getById(item.getSourceId());
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹凡涓嶅瓨鍦紒锛�");
}
- Double workQty = Math.round((asnOrder.getWorkQty() - item.getAnfme()) * 10000) / 10000.0;
+ Double workQty = Math.round((wkOrder.getWorkQty() - item.getAnfme()) * 10000) / 10000.0;
- asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
.setWorkQty(workQty.compareTo(0.00) > 0 ? workQty : 0.00)
.setUpdateBy(loginUserId)
.setUpdateTime(new Date());
- if (!outStockService.updateById(asnOrder)) {
+ if (!outStockService.updateById(wkOrder)) {
throw new CoolException("鍘熷崟鎹姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
@@ -1141,8 +1141,8 @@
.setMemo("搴撳瓨鍑哄簱锛屾棤鍗曟嵁淇℃伅锛侊紒")
.setType(OrderType.ORDER_OUT.type);
} else if (!Objects.isNull(orderItem) && StringUtils.isNotBlank(orderItem.getId() + "")) {
- AsnOrder asnOrder = asnOrderService.getById(orderItem.getAsnId());
- stock.setWkType(Short.parseShort(asnOrder.getWkType()))
+ WkOrder wkOrder = asnOrderService.getById(orderItem.getAsnId());
+ stock.setWkType(Short.parseShort(wkOrder.getWkType()))
.setType(OrderType.ORDER_OUT.type);
} else {
//TODO 鐢熸垚娉㈡鏃堕渶瑕佸皢娉㈡鍙峰啓鍏ュ崟鎹紝閫氳繃鐗╂枡锛屾壒娆★紝鍔ㄦ�佸瓧娈电瓑鍞竴鍊煎弽鏌ュ崟鎹俊鎭�
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 988d27a..e3a5f10 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -1,9 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
@@ -16,7 +13,6 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -130,7 +126,7 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(warehouseAreasItems.getMatnrCode());
- AsnOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
if (!Objects.isNull(order)) {
pakinItem.setType(null == order.getType() ? null : order.getType())
.setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
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 4318dad..7775588 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
@@ -19,8 +19,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.utils.LocManageUtil;
import com.vincent.rsf.server.manager.utils.OptimalAlgorithmUtil;
-import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -104,9 +102,9 @@
}
List<Long> orderIds = waveItems.stream().map(WaveItem::getOrderId).collect(Collectors.toList());
/**淇敼鍑哄簱鍗曠姸鎬�*/
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
- .in(AsnOrder::getId, orderIds))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
+ .in(WkOrder::getId, orderIds))) {
throw new CoolException("鍑哄簱鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
return R.ok();
@@ -253,10 +251,10 @@
});
List<Long> orders = orderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
- .set(AsnOrder::getWorkQty, 0.0)
- .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .in(AsnOrder::getId, orders))) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getWorkQty, 0.0)
+ .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .in(WkOrder::getId, orders))) {
throw new CoolException("鍗曟嵁鏇存柊澶辫触锛�!");
}
--
Gitblit v1.9.1