From 99f5c058c42521640d815f3d52dc722a5d5ad4c4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 18:59:43 +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/manager/schedules/ScheduleJobs.java | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 269 insertions(+), 17 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 c9bedbf..f04bf96 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,28 @@
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.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.entity.dto.ReceiptDetlsDto;
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.POExceStatus;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -18,6 +33,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -33,35 +49,173 @@
private PurchaseService purchaseService;
@Autowired
private PurchaseItemService purchaseItemService;
-
@Autowired
private AsnOrderService asnOrderService;
-
@Autowired
private MatnrService matnrService;
-
@Autowired
private AsnOrderItemService asnOrderItemService;
-
@Resource
private SysStockProperties flowProperties;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+ @Autowired
+ private WaitPakinItemLogService waitPakinItemLogService;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private WarehouseAreasItemServiceImpl warehouseAreasItemService;
+ @Autowired
+ private CompanysService companysService;
+
/**
* @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);
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ //鏇存柊鏀惰揣鍖哄簱瀛�
+ extracted(one, item, order, matnr);
+
+ 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.getAnfme())
+ .set(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
+ .eq(AsnOrder::getId, order.getId()))) {
+ throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ }
+ }
+
+
+ /**
+ * @author Ryan
+ * @date 2025/5/12
+ * @description: 鏀惰揣鍖哄簱瀛樻洿鏂�
+ * @version 1.0
+ */
+ private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ Companys companys = new Companys();
+ if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
+ companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
+ }
+
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setTrackCode(orderItem.getBarcode())
+ .setAreaName(areasItem.getName())
+ .setAreaId(areasItem.getId())
+ .setAsnItemId(orderItem.getId())
+ .setAsnCode(asnOrder.getCode())
+ .setAsnId(asnOrder.getId())
+ .setProdTime(orderItem.getProdTime())
+ .setPlatItemId(orderItem.getPlatItemId())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
+ .setSplrId(companys.getId())
+ //搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
+ .setUnit(orderItem.getStockUnit())
+ .setStockUnit(orderItem.getStockUnit())
+ .setMatnrCode(matnr.getCode())
+ .setAnfme(orderItem.getAnfme())
+ .setMatnrId(matnr.getId())
+ .setIsptResult(orderItem.getIsptResult())
+ .setMaktx(matnr.getName())
+ .setSplrBatch(orderItem.getSplrBatch())
+ .setWeight(matnr.getWeight())
+ .setFieldsIndex(orderItem.getFieldsIndex())
+ .setShipperId(matnr.getShipperId());
+
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(WarehouseAreasItem::getMatnrCode, orderItem.getMatnrCode())
+ .eq(!Cools.isEmpty(orderItem.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex())
+ .eq(WarehouseAreasItem::getAsnCode, orderItem.getAsnCode())
+ .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());
+ }
+ WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
+ if (!Objects.isNull(serviceOne)) {
+ item.setId(serviceOne.getId());
+ item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+ }
+ //鏈川妫�
+ if (!warehouseAreasItemService.saveOrUpdate(item)) {
+ throw new CoolException("鏀惰揣澶辫触锛侊紒");
+ }
+ }
+
+
+ /**
* @return
+ * @throws
+ * @author Ryan
+ * @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�, 鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
* @time 2025/3/3 15:44
*/
- @Scheduled(cron = "0 0/30 * * * ? ")
+ @Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
- public void genAsnOrder() {
+ public synchronized void genAsnOrder() {
//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄧ敓鎴怉SN鍗曟嵁
if (!flowProperties.getFlagAutoAsn()) {
return;
}
//鑾峰彇鏈敓鎴怉SN鍗曟嵁
- List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().eq(Purchase::getStatus, 0));
- //閲囪喘鍗曚负绌猴紝鐩存帴璺冲嚭褰撳墠浠诲姟
+ List<Purchase> purchases = purchaseService.list(new LambdaQueryWrapper<Purchase>().eq(Purchase::getExceStatus, 0));
+ //PO鍗曚负绌猴紝鐩存帴璺冲嚭褰撳墠浠诲姟
if (purchases.isEmpty()) {
return;
}
@@ -92,19 +246,30 @@
List<AsnOrderItem> orderItems = new ArrayList<>();
items.forEach(item -> {
AsnOrderItem orderItem = new AsnOrderItem();
- Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrCode()));
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
+ }
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+// String barcode = code + matnr.getCode();
orderItem.setAnfme(item.getAnfme())
.setAsnId(order.getId())
.setQty(item.getQty())
.setSplrName(item.getSplrName())
+ .setAsnCode(code)
.setSplrCode(item.getSplrCode())
- .setMatnk(item.getMatnrName())
.setPoDetlId(item.getId())
+ .setPlatItemId(item.getPlatItemId())
+ .setTrackCode(trackCode)
.setPoCode(purchase.getCode())
.setPurQty(item.getAnfme())
.setPurUnit(item.getUnit())
- .setMatnk(matnr.getName())
- .setMatnrId(matnr.getId() + "");
+ .setMatnrCode(matnr.getCode())
+ .setMaktx(matnr.getName())
+ .setMatnrId(matnr.getId());
orderItems.add(orderItem);
});
if (!asnOrderItemService.saveBatch(orderItems)) {
@@ -112,13 +277,100 @@
}
//浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
- purchase.setQty(purchase.getAnfme()).setStatus(1);
+ purchase.setQty(purchase.getAnfme())
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
- if (!purchaseService.save(purchase)) {
+ if (!purchaseService.saveOrUpdate(purchase)) {
throw new CoolException("PO鍗曟墽琛屽畬鎴愬悗锛屼繚瀛樺け璐ワ紒锛�");
}
-
});
}
+ /**
+ * @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)
+ .select(AsnOrderItem::getId));
+ if (Objects.isNull(list) || list.isEmpty()) {
+ return;
+ }
+ List<AsnOrderItem> items = new ArrayList<>();
+ list.forEach(item -> {
+ String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
+ if (StringUtils.isBlank(trackCode)) {
+ throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+// item.setTrackCode(trackCode);
+ item.setBarcode(trackCode);
+ items.add(item);
+ });
+
+ if (!asnOrderItemService.updateBatchById(items)) {
+ throw new CoolException("鐢熸垚缂栫爜澶辫触锛侊紒");
+ }
+ }
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 缁勬嫋鍘嗗彶妗�
+ * @time 2025/3/29 12:36
+ */
+ @Scheduled(cron = "0/25 * * * * ?")
+ @Transactional(rollbackFor = Exception.class)
+ public void pakinLog() {
+ 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;
+ }
+ List<Long> list = pakinIds.stream().map(WaitPakin::getId).collect(Collectors.toList());
+ List<WaitPakin> pakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().in(WaitPakin::getId, list));
+ if (pakins.isEmpty()) {
+ throw new CoolException("缁勬嫋鍗曚负绌猴紒锛�");
+ }
+ List<WaitPakinLog> pakinLogs = new ArrayList<>();
+ pakins.forEach(pakin -> {
+ WaitPakinLog log = new WaitPakinLog();
+ BeanUtils.copyProperties(pakin, log);
+ log.setPakinId(pakin.getId()).setIoStatus(Short.parseShort("2"));
+ pakinLogs.add(log);
+ });
+ if (!waitPakinLogService.saveBatch(pakinLogs)) {
+ throw new CoolException("鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ List<WaitPakinItemLog> itemLogs = new ArrayList<>();
+ List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list));
+ if (pakinItems.isEmpty()) {
+ throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
+ }
+ pakinItems.forEach(item -> {
+ WaitPakinItemLog itemLog = new WaitPakinItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setPakinItemId(item.getId())
+ .setPakinId(item.getPakinId());
+ itemLogs.add(itemLog);
+ });
+
+ if (!waitPakinItemLogService.saveBatch(itemLogs)) {
+ throw new CoolException("鍘嗗彶鏄庣粏妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ if (!waitPakinService.removeByIds(list)) {
+ throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+ }
+ if (!waitPakinItemService.remove(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getPakinId, list))) {
+ throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+ }
+ }
+
}
--
Gitblit v1.9.1