From d91fae31f20fa81081fe1b0769437be66470175d Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 03 三月 2026 14:38:25 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 67eefb8..95c66d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -220,7 +220,7 @@
BeanUtils.copyProperties(matnr, mat);
mat.setCode(matnr.getMatnr()).setName(matnr.getMaktx());
if (!Objects.isNull(matnr.getGroupName())) {
- MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()), false);
+ MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getName, matnr.getGroupName()).last("limit 1"), false);
if (Objects.isNull(matnrGroup)) {
mat.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
}
@@ -243,14 +243,14 @@
@Override
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getPoCode, queryParams.getOrderNo()));
+ .eq(WkOrder::getPoCode, queryParams.getOrderNo()).last("limit 1"));
if (Objects.isNull(wkOrders)) {
Map<String, Object> map = new HashMap<>();
map.put("exceStatus", "-1");
return R.ok("鍗曟嵁涓嶅瓨鍦� 锛侊紒").add(map);
}
- AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
+ AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()).last("limit 1"));
if (!Objects.isNull(orderLog)) {
Map<String, Object> map = new HashMap<>();
map.put("exceStatus", "4");
@@ -394,7 +394,7 @@
if (Objects.isNull(companys.getCode())) {
throw new CoolException("浼佷笟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()));
+ Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()).last("limit 1"));
if (Objects.isNull(one)) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);
companys.setCode(ruleCode);
@@ -421,6 +421,9 @@
public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
if (!syncOrders.isEmpty()) {
syncOrders.forEach(syncOrder -> {
+ if (!syncOrder.getWkType().matches("\\d+")){
+ syncOrder.setWkType(OrderWorkType.getOrderTypeUpdate(syncOrder.getWkType()));
+ }
WkOrder wkOrder = new WkOrder(syncOrder);
DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
.eq(DictData::getValue, syncOrder.getWkType()), false);
@@ -621,7 +624,7 @@
for (OrderOutItemDto orderOutItemDto : orderOutTaskItemAuto){
OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderOutItemDto);
outStockToTaskParams.setId(orderOutItemDto.getLocItem().getId());
-// outStockToTaskParams.setOutQty(locItemServiceOne.getAnfme());
+ outStockToTaskParams.setOutQty(orderOutItemDto.getOutQty());
outStockToTaskParams.setLocCode(orderOutItemDto.getLocItem().getLocCode());
outStockToTaskParams.setBarcode(orderOutItemDto.getLocItem().getBarcode());
outStockToTaskParams.setSiteNo(stationId);
--
Gitblit v1.9.1