From e9543f18fbe81fb492df941fdc6fce59424f8f49 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 08:39:36 +0800
Subject: [PATCH] RCS对接
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 134 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 115 insertions(+), 19 deletions(-)
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 40086b3..9da1c20 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
@@ -19,6 +19,7 @@
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.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +41,7 @@
* @return
* @time 2025/3/7 08:02
*/
+@Slf4j
@Service("outStockServiceImpl")
public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, WkOrder> implements OutStockService {
@@ -134,7 +136,7 @@
for (WkOrderItem orderItem : orderItems) {
if (!Objects.isNull(orderItem.getPoDetlId())) {
DeliveryItem deliveryItem = deliveryItemService.getById(orderItem.getPoDetlId());
- Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 100) / 100.0;
+ Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 1000000) / 1000000.0;
deliveryItem.setWorkQty(workQty.compareTo(0.0) >= 0 ? workQty : 0);
if (!deliveryItemService.updateById(deliveryItem)) {
throw new CoolException("DO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
@@ -142,7 +144,7 @@
Delivery delivery = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, orderItem.getPoCode()));
if (!Objects.isNull(delivery)) {
- Double wkQty = Math.round((delivery.getWorkQty() - delivery.getAnfme()) * 100) / 100.0;
+ Double wkQty = Math.round((delivery.getWorkQty() - delivery.getAnfme()) * 1000000) / 1000000.0;
delivery.setWorkQty(wkQty.compareTo(0.0) >= 0 ? wkQty : 0).setExceStatus(POExceStatus.PO_EXCE_STATUS_UN_EXCE.val);
if (!deliveryService.updateById(delivery)) {
throw new CoolException("DO鍗曟嵁淇敼澶辫触锛侊紒");
@@ -206,7 +208,7 @@
if (item.getAnfme().compareTo(0.0) <= 0) {
throw new CoolException("鍑哄簱鏁伴噺涓嶈兘灏忎簬鎴栫瓑浜庨浂锛侊紒");
}
- Double anfme = Math.round((deliveryItem.getAnfme() - item.getAnfme()) * 100) / 100.0;
+ Double anfme = Math.round((deliveryItem.getAnfme() - item.getAnfme()) * 1000000) / 1000000.0;
if (anfme.compareTo(0.0) < 0) {
throw new CoolException("鍑哄簱鏁伴噺涓嶈冻锛侊紒");
}
@@ -254,7 +256,7 @@
exceStatus = AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val;
}
- Double wkQty = Math.round((delivery.getWorkQty() + sum) * 100) / 100.0;
+ Double wkQty = Math.round((delivery.getWorkQty() + sum) * 1000000) / 1000000.0;
if (!deliveryService.update(new LambdaUpdateWrapper<Delivery>()
.set(Delivery::getExceStatus, exceStatus)
.set(Delivery::getWorkQty, wkQty)
@@ -286,7 +288,7 @@
}
Double sum = orders.stream().mapToDouble(WkOrder::getAnfme).sum();
Double workQty = orders.stream().mapToDouble(WkOrder::getWorkQty).sum();
- Double anfme = Math.round((sum - workQty) * 100) / 100.0;
+ Double anfme = Math.round((sum - workQty) * 1000000) / 1000000.0;
Wave wave = new Wave();
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_WAVE_TYPE, null);
if (StringUtils.isBlank(ruleCode)) {
@@ -351,7 +353,7 @@
throw new CoolException("鍑哄簱鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
}
for (WkOrder order : orders) {
- Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 100) / 100.0;
+ Double wkQty = Math.round((order.getWorkQty() + order.getAnfme()) * 1000000) / 1000000.0;
if (!this.update(new LambdaUpdateWrapper<WkOrder>()
.set(WkOrder::getWaveId, wave.getId())
.set(WkOrder::getWorkQty, wkQty)
@@ -478,19 +480,93 @@
if (Objects.isNull(param) || StringUtils.isBlank(param.getLocCode())) {
continue;
}
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, param.getLocCode()).eq(Loc::getBarcode, param.getBarcode()));
+ // 淇锛氭瀯寤哄簱浣嶆煡璇㈡潯浠讹紝濡傛灉barcode涓虹┖锛屽彧鎸塴ocCode鏌ヨ
+ LambdaQueryWrapper<Loc> locQueryWrapper = new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, param.getLocCode());
+ if (StringUtils.isNotBlank(param.getBarcode())) {
+ locQueryWrapper.eq(Loc::getBarcode, param.getBarcode());
+ }
+ Loc loc = locService.getOne(locQueryWrapper);
if (!Objects.isNull(loc)) {
List<LocItem> locItems = new ArrayList<>();
LocItem locItem = locItemService.getById(param.getId());
+
+ if (Objects.isNull(locItem)) {
+ throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紝ID锛�" + param.getId());
+ }
- WkOrderItem orderItem = outStockItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ // 淇锛氭瀯寤烘煡璇㈡潯浠讹紝鍏堟瀯寤哄熀纭�鏉′欢锛屽啀鏍规嵁鍊兼槸鍚︿负绌哄姩鎬佹坊鍔�
+ // 浼樺厛浣跨敤渚涘簲鍟嗘壒娆″尮閰嶏紝濡傛灉娌℃湁鍒欎娇鐢ㄥ簱瀛樻壒娆″尮閰�
+ LambdaQueryWrapper<WkOrderItem> orderItemWrapper = new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, outId)
- .eq(StringUtils.isNotBlank(locItem.getBatch()), WkOrderItem::getSplrBatch, locItem.getBatch())
- .eq(StringUtils.isNotBlank(locItem.getFieldsIndex()), WkOrderItem::getFieldsIndex, locItem.getFieldsIndex())
- .eq(WkOrderItem::getMatnrId, locItem.getMatnrId()));
+ .eq(WkOrderItem::getMatnrId, locItem.getMatnrId());
+
+ // 浼樺厛浣跨敤渚涘簲鍟嗘壒娆″尮閰�
+ if (StringUtils.isNotBlank(locItem.getSplrBatch())) {
+ orderItemWrapper.eq(WkOrderItem::getSplrBatch, locItem.getSplrBatch());
+ } else if (StringUtils.isNotBlank(locItem.getBatch())) {
+ // 濡傛灉LocItem鍙湁batch瀛楁锛屽皾璇曞悓鏃跺尮閰峎kOrderItem鐨刡atch鍜宻plrBatch瀛楁
+ // 鍥犱负鏌愪簺鎯呭喌涓婰ocItem鐨刡atch鍙兘瀵瑰簲WkOrderItem鐨剆plrBatch
+ orderItemWrapper.and(wrapper -> wrapper
+ .eq(WkOrderItem::getBatch, locItem.getBatch())
+ .or()
+ .eq(WkOrderItem::getSplrBatch, locItem.getBatch())
+ );
+ }
+
+ if (StringUtils.isNotBlank(locItem.getFieldsIndex())) {
+ orderItemWrapper.eq(WkOrderItem::getFieldsIndex, locItem.getFieldsIndex());
+ }
+ WkOrderItem orderItem = outStockItemService.getOne(orderItemWrapper);
+ // 濡傛灉鎵句笉鍒板崟鎹槑缁嗭紝涓擫ocItem鏉ヨ嚜搴撳瓨璋冩暣锛屽垯鑷姩鍒涘缓WkOrderItem
if (Objects.isNull(orderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ // 妫�鏌ユ槸鍚︽槸搴撳瓨璋冩暣浜х敓鐨勫簱瀛�
+ if (locItem.getWkType() != null &&
+ locItem.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type))) {
+ // 鑾峰彇鍑哄簱鍗曚俊鎭�
+ WkOrder outOrder = outStockService.getById(outId);
+ if (Objects.isNull(outOrder)) {
+ throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ log.info("搴撳瓨璋冩暣浜х敓鐨勫簱瀛橈紝鑷姩鍒涘缓WkOrderItem - 鍑哄簱鍗旾D锛歿}锛岀墿鏂橧D锛歿}锛屾壒娆★細{}",
+ outId, locItem.getMatnrId(), locItem.getBatch());
+
+ // 鍒涘缓WkOrderItem
+ orderItem = new WkOrderItem();
+ orderItem.setOrderId(outId)
+ .setOrderCode(outOrder.getCode())
+ .setMatnrId(locItem.getMatnrId())
+ .setMatnrCode(locItem.getMatnrCode())
+ .setMaktx(locItem.getMaktx())
+ .setBatch(StringUtils.isNotBlank(param.getBatch()) ? param.getBatch() : locItem.getBatch())
+ .setSplrBatch(StringUtils.isNotBlank(locItem.getSplrBatch()) ? locItem.getSplrBatch() :
+ (StringUtils.isNotBlank(locItem.getBatch()) ? locItem.getBatch() : null))
+ .setFieldsIndex(locItem.getFieldsIndex())
+ .setAnfme(param.getOutQty())
+ .setWorkQty(0.0)
+ .setStockUnit(locItem.getUnit())
+ .setPurUnit(locItem.getUnit())
+ .setSpec(locItem.getSpec())
+ .setModel(locItem.getModel())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date());
+
+ if (!outStockItemService.save(orderItem)) {
+ throw new CoolException("搴撳瓨璋冩暣鍗曟嵁鏄庣粏鍒涘缓澶辫触锛侊紒");
+ }
+
+ log.info("WkOrderItem鍒涘缓鎴愬姛 - ID锛歿}锛屽嚭搴撳崟ID锛歿}锛岀墿鏂橧D锛歿}",
+ orderItem.getId(), outId, locItem.getMatnrId());
+ } else {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛佸嚭搴撳崟ID锛�" + outId + "锛岀墿鏂橧D锛�" + locItem.getMatnrId() +
+ (StringUtils.isNotBlank(locItem.getSplrBatch()) ? "锛屼緵搴斿晢鎵规锛�" + locItem.getSplrBatch() :
+ StringUtils.isNotBlank(locItem.getBatch()) ? "锛屽簱瀛樻壒娆★細" + locItem.getBatch() : "") +
+ (StringUtils.isNotBlank(locItem.getFieldsIndex()) ? "锛屽瓧娈电储寮曪細" + locItem.getFieldsIndex() : ""));
+ }
}
locItem.setOutQty(param.getOutQty())
@@ -514,8 +590,7 @@
throw new CoolException(e.getMessage());
}
-
- Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 100) / 100.0;
+ Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 1000000) / 1000000.0;
orderItem.setUpdateBy(loginUserId).setUpdateTime(new Date()).setWorkQty(workQty);
@@ -531,7 +606,7 @@
if (Objects.isNull(outOrder)) {
throw new CoolException("鍑哄簱鍗曟嵁涓嶅瓨鍦紒锛�");
}
- Double workQty = Math.round((outOrder.getWorkQty() + sum) * 100) / 100.0;
+ Double workQty = Math.round((outOrder.getWorkQty() + sum) * 1000000) / 1000000.0;
outOrder.setWorkQty(workQty).setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_CREATE.val);
@@ -570,7 +645,7 @@
if (!items.isEmpty()) {
for (WkOrderItem orderItem : items) {
DeliveryItem deliveryItem = deliveryItemService.getById(orderItem.getPoDetlId());
- Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 100) / 100.0;
+ Double workQty = Math.round((deliveryItem.getWorkQty() - orderItem.getAnfme()) * 1000000) / 1000000.0;
deliveryItem.setWorkQty(workQty.compareTo(0.0) >= 0 ? workQty : 0);
if (!deliveryItemService.updateById(deliveryItem)) {
throw new CoolException("DO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
@@ -578,7 +653,7 @@
Delivery delivery = deliveryService.getOne(new LambdaQueryWrapper<Delivery>().eq(Delivery::getCode, orderItem.getPoCode()));
if (!Objects.isNull(delivery)) {
- Double wkQty = Math.round((delivery.getWorkQty() - delivery.getAnfme()) * 100) / 100.0;
+ Double wkQty = Math.round((delivery.getWorkQty() - delivery.getAnfme()) * 1000000) / 1000000.0;
delivery.setWorkQty(wkQty.compareTo(0.0) >= 0 ? wkQty : 0).setExceStatus(POExceStatus.PO_EXCE_STATUS_UN_EXCE.val);
if (!deliveryService.updateById(delivery)) {
throw new CoolException("DO鍗曟嵁淇敼澶辫触锛侊紒");
@@ -686,7 +761,7 @@
private List<WaveItem> mergeWave(List<WkOrderItem> orderItems, Wave wave) {
List<WaveItem> items = new ArrayList<>();
orderItems.forEach(order -> {
- Double anfme = Math.round((order.getAnfme() - order.getWorkQty()) * 100) / 100.0;
+ Double anfme = Math.round((order.getAnfme() - order.getWorkQty()) * 1000000) / 1000000.0;
WaveItem item = new WaveItem();
BeanUtils.copyProperties(order, item);
item.setId(null)
@@ -712,7 +787,7 @@
p1.getUnit(),
p1.getTrackCode(),
p1.getFieldsIndex(),
- Math.round((p1.getAnfme() + p2.getAnfme()) * 100) / 100.0,
+ Math.round((p1.getAnfme() + p2.getAnfme())* 1000000) / 1000000.0,
p1.getWorkQty(),
p1.getTenantId(),
p1.getStatus(),
@@ -728,4 +803,25 @@
return waveItems;
}
+
+
+ /**
+ * @param id
+ * @return
+ * @author Ryan
+ * @description 瀹屾垚鍑哄簱鍗�
+ * @time 2025/4/25 10:07
+ */
+ @Override
+ public R completeOutOrderById(Long id) {
+ WkOrder order = this.getById(id);
+ if (Objects.isNull(order)) {
+ return R.error("鍑哄簱鍗曚笉瀛樺湪锛侊紒");
+ }
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+ if (!this.updateById(order)) {
+ throw new CoolException("瀹屾垚鍑哄簱鍗曞け璐ワ紒锛�");
+ }
+ return R.ok("瀹屾垚鍑哄簱鍗曟垚鍔燂紒锛�");
+ }
}
--
Gitblit v1.9.1