From 7977627e83ce88cb34dfd6e3243ef790b493bd70 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 16:26:09 +0800
Subject: [PATCH] 质检单功能优化 新增配置自动收货功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 19 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 3ea93c3..6519f6d 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
@@ -1,13 +1,22 @@
package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.config.SysStockProperties;
import com.vincent.rsf.server.common.utils.CommonUtil;
import com.vincent.rsf.server.common.utils.DateUtils;
+import com.vincent.rsf.server.manager.controller.params.WarehouseAreaParam;
import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
+import com.vincent.rsf.server.manager.enums.PakinIOStatus;
+import com.vincent.rsf.server.manager.enums.WarehouseAreasType;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.WarehouseAreasItemServiceImpl;
+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.service.ConfigService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -37,16 +46,12 @@
private PurchaseService purchaseService;
@Autowired
private PurchaseItemService purchaseItemService;
-
@Autowired
private AsnOrderService asnOrderService;
-
@Autowired
private MatnrService matnrService;
-
@Autowired
private AsnOrderItemService asnOrderItemService;
-
@Resource
private SysStockProperties flowProperties;
@Autowired
@@ -57,18 +62,83 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private WaitPakinItemLogService waitPakinItemLogService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private WarehouseAreasItemServiceImpl warehouseAreasItemService;
/**
* @author Ryan
- * @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�,鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
- * @throws
+ * @date 2025/5/9
+ * @description: 鐩存帴缁勬墭寮�鍏充负true锛屽皢鏀惰揣鍗曠洿鎺ュ姞鍏ヤ复鏃跺簱瀛�
+ * @version 1.0
+ */
+// @Scheduled(cron = "0 0/05 * * * ? ")
+ @Scheduled(cron = "0/25 * * * * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized void IgnoreReceipt() {
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+ if (Objects.isNull(config)) {
+ return;
+ }
+
+ if (!Boolean.parseBoolean(config.getVal())) {
+ return;
+ }
+ List<AsnOrder> orders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
+ if (!orders.isEmpty()) {
+ for (AsnOrder order : orders) {
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ if (orderItems.isEmpty()) {
+ return;
+ }
+ List<WarehouseAreasItem> items = new ArrayList<>();
+ for (AsnOrderItem item : orderItems) {
+ WarehouseAreas one = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
+ Long areaId = Objects.isNull(one) ? null : one.getId();
+ String areaName = Objects.isNull(one) ? null : one.getName();
+
+ WarehouseAreasItem param = new WarehouseAreasItem();
+ BeanUtils.copyProperties(item, param);
+ param.setAreaId(one.getId())
+ .setAsnCode(order.getCode())
+ .setAreaId(areaId)
+ .setAreaName(areaName)
+ .setAsnId(order.getId());
+ items.add(param);
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().set(AsnOrderItem::getQty, item.getAnfme()).eq(AsnOrderItem::getId, item.getId()))) {
+ throw new CoolException("鏀惰揣鍗曟槑缁嗗畬鎴愭暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ if (!warehouseAreasItemService.saveBatch(items)) {
+ throw new CoolException("鏀惰揣鍗曚繚瀛樿嚦鏀惰揣鍖烘墽琛屽け璐ワ紒锛�");
+ }
+
+ if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>()
+ .set(AsnOrder::getQty, order.getQty())
+ .set(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
+ .eq(AsnOrder::getId, order.getId()))) {
+ throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+ }
+
+
+ /**
* @return
+ * @throws
+ * @author Ryan
+ * @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�, 鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
* @time 2025/3/3 15:44
*/
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
- public void genAsnOrder() {
+ public synchronized void genAsnOrder() {
//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
if (!flowProperties.getFlagAutoAsn()) {
return;
@@ -129,7 +199,7 @@
.setPurUnit(item.getUnit())
.setMatnrCode(matnr.getCode())
.setMaktx(matnr.getName())
- .setMatnrId(matnr.getId() + "");
+ .setMatnrId(matnr.getId());
orderItems.add(orderItem);
});
if (!asnOrderItemService.saveBatch(orderItems)) {
@@ -146,17 +216,17 @@
}
/**
- * @author Ryan
- * @description 鐢熸垚鐗╂枡鏍囩
* @param
* @return
+ * @author Ryan
+ * @description 鐢熸垚鐗╂枡鏍囩
* @time 2025/3/29 12:35
*/
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void generateMatnrLabel() {
List<AsnOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
- .isNull(AsnOrderItem::getTrackCode)
+ .isNull(AsnOrderItem::getTrackCode)
.select(AsnOrderItem::getId));
if (Objects.isNull(list) || list.isEmpty()) {
return;
@@ -167,7 +237,8 @@
if (StringUtils.isBlank(trackCode)) {
throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
}
- item.setTrackCode(trackCode);
+// item.setTrackCode(trackCode);
+ item.setBarcode(trackCode);
items.add(item);
});
@@ -177,16 +248,18 @@
}
/**
- * @author Ryan
- * @description 缁勬嫋鍘嗗彶妗�
* @param
* @return
+ * @author Ryan
+ * @description 缁勬嫋鍘嗗彶妗�
* @time 2025/3/29 12:36
*/
- @Scheduled(cron = "0/5 * * * * ?")
+ @Scheduled(cron = "0/25 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void pakinLog() {
- List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getIoStatus, 2).select(WaitPakin::getId));
+ List<WaitPakin> pakinIds = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getIoStatus, Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val))
+ .select(WaitPakin::getId));
if (pakinIds.isEmpty()) {
return;
}
@@ -196,7 +269,7 @@
throw new CoolException("缁勬嫋鍗曚负绌猴紒锛�");
}
List<WaitPakinLog> pakinLogs = new ArrayList<>();
- pakins.forEach(pakin ->{
+ pakins.forEach(pakin -> {
WaitPakinLog log = new WaitPakinLog();
BeanUtils.copyProperties(pakin, log);
log.setPakinId(pakin.getId()).setIoStatus(Short.parseShort("2"));
@@ -221,10 +294,10 @@
if (!waitPakinItemLogService.saveBatch(itemLogs)) {
throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
}
- if (!waitPakinService.removeByIds(pakins)) {
+ if (!waitPakinService.removeByIds(list)) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
- if (!waitPakinItemService.removeByIds(pakinItems)) {
+ if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
}
--
Gitblit v1.9.1