From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 166 +++++++++++++++++++++++++++++++------------------------
1 files changed, 93 insertions(+), 73 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 1a6b0ce..7cbc8e9 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
@@ -47,6 +47,7 @@
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;
@@ -216,7 +217,6 @@
}
List<ReceiptDetlsDto> receipts = receiptParam.getReceipts();
- List<WarehouseAreasItem> allOrders = new ArrayList<>();
Double receiptQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getReceiptQty).sum();
@@ -254,10 +254,14 @@
// if (dto.getReceiptQty().compareTo(dto.getAnfme()) > 0) {
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬閲囪喘鏁伴噺锛侊紒");
// }
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, asnCode)
- .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
- .eq(AsnOrderItem::getMatnrId, dto.getMatnrId()));
+// AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>()
+// .eq(AsnOrderItem::getAsnCode, asnCode)
+// .eq(AsnOrderItem::getId, dto.getId())
+// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
+// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
+
+ AsnOrderItem orderItem = asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+
if (Objects.isNull(orderItem)) {
throw new CoolException("閫氱煡鍗曟槑缁嗕笉瀛樺湪锛侊紒");
}
@@ -266,7 +270,8 @@
}
Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
orderItem.setQty(itemRcptQty)
- .setSplrBatch(dto.getSplrBatch())
+// .setSplrBatch(dto.getSplrBatch())
+ .setUpdateBy(loginUserId)
.setStockUnit(dto.getStockUnit())
.setProdTime(dto.getProdTime());
@@ -289,65 +294,65 @@
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
- WarehouseAreasItem item = new WarehouseAreasItem();
-// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String format = null;
-// if (Objects.isNull(dto.getProdTime())) {
-// format = dateFormat.format(dto.getProdTime());
-// }
- item.setTrackCode(dto.getBarcode())
- .setAreaName(areasItem.getName())
- .setAreaId(areasItem.getId())
- .setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
- .setProdTime(dto.getProdTime())
- .setWeight(dto.getWeigth())
- //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
- .setUnit(orderItem.getStockUnit())
- .setStockUnit(orderItem.getStockUnit())
- .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
- .setAnfme(dto.getReceiptQty())
- .setSplrBatch(dto.getSplrBatch())
- .setMatnrCode(matnr.getCode())
- .setUpdateBy(loginUserId)
- .setCreateBy(loginUserId)
- .setMatnrId(matnr.getId())
- .setMaktx(matnr.getName())
- .setWeight(matnr.getWeight())
- .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());
+ 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);
+ }
}
-
- if (!warehouseAreasItemService.saveOrUpdate(item)) {
- throw new CoolException("鏀惰揣澶辫触锛侊紒");
- }
-
}
-// if (!warehouseAreasItemService.saveBatch(allOrders)) {
-// throw new CoolException("鏀惰揣澶辫触锛侊紒");
-// }
-// //鑾峰彇閲囪喘鏁伴噺
-// double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
-//
-// BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
-// //鍒ゆ柇宸叉敹璐ф暟閲忔槸鍚﹀皬浜庣瓑浜庨噰璐暟閲�
-// if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {
-// asnOrder.setRleStatus(Short.valueOf("1"));
-// //鏃ュ織琛ㄦ搷浣�
-// operateOrderLogs(asnOrder);
-// }
- return R.ok(asnOrder);
+ AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::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)) {
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+ return R.ok("鏀惰揣鎴愬姛锛侊紒");
+ }
+
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setTrackCode(dto.getBarcode())
+ .setAreaName(areasItem.getName())
+ .setAreaId(areasItem.getId())
+ .setAsnItemId(orderItem.getId())
+ .setAsnCode(asnOrder.getCode())
+ .setAsnId(asnOrder.getId())
+ .setProdTime(dto.getProdTime())
+ .setWeight(dto.getWeigth())
+ //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
+ .setUnit(orderItem.getStockUnit())
+ .setStockUnit(orderItem.getStockUnit())
+ .setBatch(StringUtils.isBlank(orderItem.getBatch()) ? SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_RECEIPT_BATCH, dto) : orderItem.getBatch())
+ .setAnfme(dto.getReceiptQty())
+ .setSplrBatch(dto.getSplrBatch())
+ .setMatnrCode(matnr.getCode())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
+ .setMatnrId(matnr.getId())
+ .setMaktx(matnr.getName())
+ .setWeight(matnr.getWeight())
+ .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("鏀惰揣澶辫触锛侊紒");
+ }
}
/**
@@ -363,7 +368,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("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
@@ -425,13 +432,19 @@
* @time 2025/4/7 16:58
*/
@Override
- public R getDeltByCode(String code) {
+ 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();
+ }
//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(WarehouseAreasItem::getTrackCode, code)
+ .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));
+ return R.ok(warehouseAreasItemService.getOne(queryWrapper, false));
}
/**
@@ -807,6 +820,9 @@
*/
@Override
public R getItemByContainer(Map<String, Object> params) {
+ 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;
@@ -934,6 +950,7 @@
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
detlsDto.setAsnCode(asnOrderItem.getAsnCode())
+ .setId(asnOrderItem.getId())
.setMaktx(asnOrderItem.getMaktx())
.setFieldsIndex(asnOrderItem.getFieldsIndex())
.setBarcode(asnOrderItem.getTrackCode())
@@ -943,7 +960,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)) {
@@ -952,12 +972,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