From 91831843f3b9fa4c9f29e518e10dae5d3f9aead8 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 10:40:51 +0800
Subject: [PATCH] 增加几种出入库单类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 31 +++----------------------------
1 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index 2f50b9b..9d309d5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.config.SysStockProperties;
import com.vincent.rsf.server.common.utils.DateUtils;
@@ -13,10 +12,7 @@
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.FieldsItem;
import com.vincent.rsf.server.system.service.ConfigService;
-import com.vincent.rsf.server.system.service.FieldsItemService;
-import com.vincent.rsf.server.system.service.impl.FieldsItemServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -68,8 +64,6 @@
private TransferService transferService;
@Autowired
private OutStockService outStockService;
- @Autowired
- private FieldsItemService fieldsItemService;
/**
* 鑷姩鏀惰揣锛氫粎褰� DirectWaitPakin 閰嶇疆涓� true 鏃舵墽琛岋紝灏嗘湭鎵ц鍏ュ簱鍗曠洿鎺ユ敹璐у苟鍐欏叆鏀惰揣鍖猴紝鏇存柊鍗曟嵁鐘舵�佷负鏀惰揣瀹屾垚銆�
@@ -167,29 +161,10 @@
.setWeight(matnr.getWeight())
.setFieldsIndex(orderItem.getFieldsIndex())
.setShipperId(matnr.getShipperId());
- if (StringUtils.isNotBlank(orderItem.getFieldsIndex())) {
- List<WarehouseAreasItem> warehousList = warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex()));
- WarehouseAreasItem warehousItem = warehousList.isEmpty() ? null : warehousList.get(0);
- if (Objects.nonNull(warehousItem)) {
- List<FieldsItem> fieldsList = fieldsItemService.list(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getUuid, orderItem.getFieldsIndex()).last("LIMIT 1"));
- FieldsItem fieldsItem = fieldsList.isEmpty() ? null : fieldsList.get(0);
- if (Objects.nonNull(fieldsItem)) {
- // 绁ㄥ彿宸插湪鏀惰揣鍖烘椂璺宠繃鎺ㄩ�侊紝閬垮厤瀹氭椂浠诲姟鍙嶅鎶涢敊锛涜涓哄凡鏀惰揣锛岀敱鍚庣画閫昏緫鏇存柊鍗曟嵁鐘舵��
- log.warn("绁ㄥ彿锛歿} 宸插湪鏀惰揣鍖猴紝璺宠繃鎺ㄩ��", fieldsItem.getValue());
- return;
- }
- }
- }
+ // 鎸� ASN 鏄庣粏鍞竴鏍囪瘑钀芥敹璐у尯锛屽悓涓�鍗曟嵁涓嶅悓琛屼笉鍥犵墿鏂�/绁ㄥ彿鐩稿悓鑰屽悎骞舵垚涓�琛�
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
- .eq(WarehouseAreasItem::getMatnrCode, orderItem.getMatnrCode())
- .eq(!Cools.isEmpty(orderItem.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex())
- .eq(WarehouseAreasItem::getAsnCode, orderItem.getOrderCode())
- .eq(StringUtils.isNotBlank(orderItem.getSplrBatch()), WarehouseAreasItem::getSplrBatch, orderItem.getSplrBatch());
- if (Objects.isNull(orderItem.getIsptResult())) {
- queryWrapper.isNull(WarehouseAreasItem::getIsptResult);
- } else {
- queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult());
- }
+ .eq(WarehouseAreasItem::getAsnItemId, orderItem.getId())
+ .eq(WarehouseAreasItem::getAsnId, wkOrder.getId());
WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
if (Objects.nonNull(serviceOne)) {
item.setId(serviceOne.getId());
--
Gitblit v1.9.1