From d7355ce983c2bddcc5b95e4d84283f6631fb176a Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 27 十一月 2025 13:38:46 +0800
Subject: [PATCH] 修改入出库历史的拣料类型，不上传ERP
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 78 insertions(+), 15 deletions(-)
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 360de94..d8b524c 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
@@ -14,13 +14,17 @@
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.LocItemWorkingServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.StockServiceImpl;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.entity.Config;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.entity.FieldsItem;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.service.impl.ConfigServiceImpl;
import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.service.impl.FieldsServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -63,6 +67,12 @@
private StockService stockService;
@Autowired
private StockItemServiceImpl stockItemService;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private LocItemWorkingService locItemWorkingService;
+ @Autowired
+ private ConfigServiceImpl configService;
@Override
public R getOutStockTaskItem(String barcode) {
@@ -270,12 +280,20 @@
if (Objects.isNull(orderItem)) {
throw new CoolException("鏁版嵁閿欒锛屾嫞鏂欎笉鍦ㄥ崟鎹渶姹備腑锛侊紒");
}
+ //taskItems涓烘嫞璐ф槑缁嗭紝浣滃弬鏁颁笂鎶�
Double summed = items.stream().mapToDouble(TaskItem::getAnfme).sum();
//鍔犱笂鍘嗗彶鎷ｆ枡鏁伴噺
Double pickQty = Math.round((orderItem.getQty() + summed) * 100) / 100.0;
- if (pickQty.compareTo(orderItem.getAnfme()) > 0.0) {
- throw new CoolException("鎾鏁伴噺涓嶈兘瓒呭嚭璁㈠崟闇�姹傛暟閲�");
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
+ //鍒ゆ柇鏄惁鍏佽瓒呮敹锛屼笉鍏佽瓒呮敹娣诲姞鎷掓敹鍒ゆ柇
+ if (!Objects.isNull(config)) {
+ if (!Boolean.parseBoolean(config.getVal())) {
+ if (pickQty.compareTo(orderItem.getAnfme()) > 0.0) {
+ throw new CoolException("鎾鏁伴噺涓嶈兘瓒呭嚭璁㈠崟闇�姹傛暟閲�");
+ }
+ }
}
+
orderItem.setQty(pickQty);
if (!asnOrderItemService.updateById(orderItem)) {
@@ -305,13 +323,32 @@
List<StockItem> stockItems = new ArrayList<>();
items.forEach(taskItem -> {
- taskItem.setQty(taskItem.getAnfme()).setOrderId(order.getId()).setOrderItemId(orderItem.getId());
- if (!taskItemService.updateById(taskItem)) {
+ TaskItem item = taskItemService.getById(taskItem.getId());
+ //鍒ゆ柇鏄惁鍏佽瓒呮敹锛屼笉鍏佽瓒呮敹娣诲姞鎷掓敹鍒ゆ柇
+ if (!Objects.isNull(config)) {
+ LocItemWorking serviceOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getFieldsIndex, item.getFieldsIndex()));
+ if (Objects.isNull(serviceOne)) {
+ throw new CoolException("缂撳瓨鏁版嵁涓㈠け锛侊紒");
+ }
+ //涓嶇鏄惁鍏佽瓒呮敹锛岄兘闇�鍒ゆ柇鏄惁瓒呭嚭搴撳瓨鑼冨洿
+ if (taskItem.getAnfme().compareTo(serviceOne.getAnfme()) > 0) {
+ throw new CoolException("鎷ｈ揣鏁伴噺瓒呭嚭褰撳墠绁ㄥ彿搴撳瓨鏁伴噺锛侊紒");
+ }
+ if (!Boolean.parseBoolean(config.getVal())) {
+ if (item.getAnfme().compareTo(item.getQty() + taskItem.getAnfme()) < 0.0) {
+ throw new CoolException("鍓嶅綋鐗╂枡宸茶秴鍑哄彲鎷ｈ寖鍥达紝璇锋牳瀵瑰悗鍐嶆搷浣滐紒锛�");
+ }
+ }
+ }
+
+ item.setQty(item.getQty() + taskItem.getAnfme()).setOrderId(order.getId()).setOrderItemId(orderItem.getId());
+ if (!taskItemService.updateById(item)) {
throw new CoolException("鐘舵�佸畬鎴愬け璐ワ紒锛�");
}
StockItem stockItem = new StockItem();
- BeanUtils.copyProperties(taskItem, stockItem);
- stockItem.setStockId(stock.getId()).setStockCode(stock.getCode()).setSourceItemId(orderItem.getId());
+ BeanUtils.copyProperties(item, stockItem);
+ //taskItem涓轰笂鎶ユ暟鎹�
+ stockItem.setStockId(stock.getId()).setAnfme(taskItem.getAnfme()).setStockCode(stock.getCode()).setSourceItemId(orderItem.getId());
stockItems.add(stockItem);
});
if (!stockItemService.saveBatch(stockItems)) {
@@ -321,8 +358,8 @@
List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, params.getOrderId()));
double total = orderItems.stream().mapToDouble(WkOrderItem::getQty).sum();
- double wkQty = orderItems.stream().mapToDouble(WkOrderItem::getWorkQty).sum();
- order.setQty(total).setWorkQty(order.getWorkQty() - wkQty);
+ Double wkQty = orderItems.stream().mapToDouble(WkOrderItem::getWorkQty).sum();
+ order.setQty(total).setWorkQty(order.getWorkQty().compareTo(wkQty) < 0 ? 0.0 : (total - wkQty));
if (!asnOrderService.updateById(order)) {
throw new CoolException("璁㈠崟鏁伴噺鏇存柊澶辫触锛侊紒");
}
@@ -399,6 +436,25 @@
if (!taskItemService.updateById(item)) {
throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触");
}
+ LocItemWorking oldOne = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
+ .eq(LocItemWorking::getFieldsIndex, byId.getFieldsIndex()));
+ if (Objects.isNull(oldOne)) {
+ throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
+ }
+ LocItemWorking one = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
+ .eq(LocItemWorking::getMatnrCode, byId.getMatnrCode())
+ .eq(LocItemWorking::getFieldsIndex, uuid));
+ if (Objects.isNull(one)) {
+ throw new CoolException("鏄庣粏涓嶅瓨鍦ㄦ垨宸插嚭搴擄紒锛�");
+ }
+ one.setWorkQty(oldOne.getWorkQty());
+ oldOne.setWorkQty(0.0);
+
+ //鏇存柊搴撲綅淇℃伅
+ locItemWorkingService.updateById(oldOne);
+ locItemWorkingService.updateById(one);
+
}
return R.ok();
}
@@ -430,12 +486,19 @@
return R.error("浠诲姟鐘舵�佷笉鏄緟鎻�鐙�鎱�");
}
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
- taskItems.forEach(taskItem -> {
- if (!(taskItem.getQty().compareTo(taskItem.getAnfme()) == 0)) {
- throw new CoolException("鏈夊崟鎹墿鏂欐湭鎷ｏ紝璇锋嫞瀹屽悗鍐嶇‘璁わ紒锛�");
- }
- });
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
+ //鍒ゆ柇鏄惁鍏佽瓒呮敹锛屼笉鍏佽瓒呮敹娣诲姞鎷掓敹鍒ゆ柇
+ if (!Objects.isNull(config)) {
+ if (!Boolean.parseBoolean(config.getVal())) {
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ taskItems.forEach(taskItem -> {
+ if ((taskItem.getQty().compareTo(taskItem.getAnfme()) < 0)) {
+ throw new CoolException("鏈夊崟鎹墿鏂欐湭鎷ｏ紝璇锋嫞瀹屽悗鍐嶇‘璁わ紒锛�");
+ }
+ });
+ }
+ }
+
try {
if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
@@ -447,7 +510,7 @@
}
}
} catch (Exception e) {
- throw new CoolException("鍒嗘弨澶辫触");
+ throw new CoolException("鍒嗘嫞澶辫触");
}
return R.ok();
}
--
Gitblit v1.9.1