From 5f13213af588444a59d0b3725f3d028cbdaffca4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 15:46:22 +0800
Subject: [PATCH] 完成任务优化 删除组托优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 101 +++++++++++++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 42 deletions(-)
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 d59b56d..c275000 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
@@ -8,13 +8,12 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.params.*;
import com.vincent.rsf.server.api.entity.dto.*;
-import com.vincent.rsf.server.api.entity.enums.OrderType;
-import com.vincent.rsf.server.api.entity.enums.OrderWorkType;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.api.service.MobileService;
import com.vincent.rsf.server.common.config.ConfigProperties;
import com.vincent.rsf.server.common.enums.WarehouseAreaType;
import com.vincent.rsf.server.common.security.JwtSubject;
-import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
@@ -37,7 +36,6 @@
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +45,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -293,15 +289,9 @@
if (asnOrderItemMapper.updateById(orderItem) < 1) {
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
+ /**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
+ extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
- List<QlyIsptItem> isptItems = qlyIsptItemService.list(new LambdaQueryWrapper<QlyIsptItem>().eq(QlyIsptItem::getAsnItemId, dto.getId()));
- if (isptItems.isEmpty()) {
- extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
- } else {
- for (QlyIsptItem isptItem : isptItems) {
- extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
- }
- }
}
AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
@@ -340,19 +330,38 @@
.setFieldsIndex(orderItem.getFieldsIndex())
.setShipperId(matnr.getShipperId());
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
-
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
.eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
.eq(WarehouseAreasItem::getTrackCode, item.getTrackCode())
.eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
if (!Objects.isNull(serviceOne)) {
item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
- item.setId(serviceOne.getId());
}
+ //鏈川妫�
if (!warehouseAreasItemService.saveOrUpdate(item)) {
throw new CoolException("鏀惰揣澶辫触锛侊紒");
}
+
+// if (null != orderItem.getSafeQty() || null != orderItem.getDisQty() ) {
+//
+// }
+// else {
+// //涓嶅悎鏍兼暟閲�
+// if (orderItem.getDisQty().compareTo(0.00) > 0) {
+// item.setIsptQty(orderItem.getDisQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_DEFECT.val);
+// if (!warehouseAreasItemService.saveOrUpdate(item)) {
+// throw new CoolException("鏀惰揣澶辫触锛侊紒");
+// }
+// }
+//
+// item.setIsptQty(orderItem.getSafeQty()).setFlagNorm(QlyIsptResult.QLY_ISPT_RESULT_EXCELLENT.val);
+// if (!warehouseAreasItemService.saveOrUpdate(item)) {
+// throw new CoolException("鏀惰揣澶辫触锛侊紒");
+// }
+// }
+
+
}
/**
@@ -368,7 +377,9 @@
}
List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
.eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode()));
+ .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
+ .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+ );
if (Objects.isNull(asnOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -431,18 +442,20 @@
*/
@Override
public R getDeltByCode(Map<String, Object> params) {
- String code = params.get("code").toString();
- String batch = null;
- if (!Objects.isNull(params.get("batch"))) {
- batch = params.get("batch").toString();
- }
+ Object code = params.get("code");
+ Object matnrCode = params.get("matnrCode");
+ Object asnCode = params.get("asnCode");
+ Object batch = params.get("batch");
+
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
- LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit, qty, work_qty, matnr_code, matnr_id, maktx").lambda()
- .eq(StringUtils.isNotBlank(code), WarehouseAreasItem::getTrackCode, code)
- .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)
- .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);
- return R.ok(warehouseAreasItemService.getOne(queryWrapper, false));
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)
+ .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)
+ .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)
+ .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode);
+ List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);
+ list.removeIf(e -> e.getAnfme() <= e.getWorkQty());
+ return R.ok(list);
}
/**
@@ -683,6 +696,8 @@
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setWkType(Short.parseShort(order.getWkType()));
if (!stockService.save(stock)) {
throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -701,6 +716,8 @@
.setId(null)
.setLocCode(loc.getCode())
.setOrderId(order.getId())
+ .setUpdateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setOrderItemId(asnOrderItem.getId())
.setWkType(Short.parseShort(order.getWkType()))
.setType(order.getType());
@@ -818,9 +835,9 @@
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
- if (Objects.isNull(params.get("code"))) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(params.get("code"))) {
+// throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+// }
//鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
Short flagDefect = 0;
@@ -844,11 +861,8 @@
} else {
List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
.lambda()
- .in(WarehouseAreasItem::getTrackCode, list)
- .groupBy(WarehouseAreasItem::getSplrBatch,
- WarehouseAreasItem::getTrackCode);
+ .in(WarehouseAreasItem::getTrackCode, list);
List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
for (int i = 0; i < warehouseAreasItems.size(); i++) {
for (WaitPakinItem pakinItem : pakinItems) {
@@ -958,7 +972,10 @@
.setPoCode(asnOrderItem.getPoCode())
.setAnfme(asnOrderItem.getAnfme())
.setPurQty(asnOrderItem.getPurQty())
- .setSplrBatch(asnOrderItem.getSplrBatch());
+ .setSplrBatch(asnOrderItem.getSplrBatch())
+ .setMatnr(asnOrderItem.getMatnrCode())
+ .setInspect(asnOrderItem.getIsptResult$()) //璐ㄦ缁撴灉
+ ;
Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -967,12 +984,12 @@
//SET 鐗╂枡鏈�澶у瓨鏀炬暟閲�
detlsDto.setMaxQty(matnr.getMaxQty())
.setMatnrId(matnr.getId());
- QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
- .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
- if (!Objects.isNull(inspect)) {
- //set 璐ㄦ缁撴灉
- detlsDto.setInspect(inspect.getStatus$());
- }
+// QlyInspect inspect = qlyInspectMapper.selectOne(new LambdaQueryWrapper<QlyInspect>()
+// .eq(QlyInspect::getAsnId, asnOrderItem.getAsnId()));
+// if (!Objects.isNull(inspect)) {
+// //set 璐ㄦ缁撴灉
+// detlsDto.setInspect(inspect.getStatus$());
+// }
//鑾峰彇褰撳墠搴撳瓨淇℃伅
LocItem stockItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
// .eq(LocItem::getOrderItemId, asnOrderItem.getId())
--
Gitblit v1.9.1