From b003a49794f49a329e2702918ecfc8d14b371d0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 04 三月 2026 14:51:25 +0800
Subject: [PATCH] 云仓WMS接口流程
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 290 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 162 insertions(+), 128 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 b74f20f..9eaaa0e 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
@@ -7,15 +7,16 @@
import com.vincent.rsf.server.common.config.SysStockProperties;
import com.vincent.rsf.server.common.utils.DateUtils;
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.WarehouseAreasType;
+import com.vincent.rsf.server.manager.enums.*;
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.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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -26,6 +27,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -60,131 +62,163 @@
private WarehouseAreasItemServiceImpl warehouseAreasItemService;
@Autowired
private CompanysService companysService;
+ @Autowired
+ private TransferService transferService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private FieldsItemService fieldsItemService;
- /**
- * @author Ryan
- * @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<WkOrder> orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
- if (!orders.isEmpty()) {
- for (WkOrder 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("鏀惰揣鍗曚繚瀛樿嚦鏀惰揣鍖烘墽琛屽け璐ワ紒锛�");
+// /**
+// * @author Ryan
+// * @date 2025/5/9
+// * @description: 鐩存帴缁勬墭寮�鍏充负true锛屽皢鏀惰揣鍗曠洿鎺ュ姞鍏ヤ复鏃跺簱瀛�
+// * @version 1.0
+// */
+// @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<WkOrder> orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+// .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+// .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
+// if (!orders.isEmpty()) {
+// for (WkOrder order : orders) {
+// if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+// WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
+// .eq(WkOrder::getPoCode, order.getPoCode())
+// .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
+// if (Objects.isNull(one)) {
+// throw new CoolException("鏁版嵁閿欒");
+// }
+// if (!one.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)) {
+// continue;
+// }
// }
-
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .set(WkOrder::getQty, order.getAnfme())
- .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
- .eq(WkOrder::getId, order.getId()))) {
- throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
- }
- }
- }
- }
+//
+// List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+// if (orderItems.isEmpty()) {
+// return;
+// }
+// // 鏀惰揣鍖哄凡鍋滅敤锛氫笉鍐嶅啓鍏ユ敹璐у尯锛屼粎鏇存柊鍗曟嵁鐘舵�佷笌鏁伴噺
+//// List<WarehouseAreas> receiptAreas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+//// .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type));
+//// WarehouseAreas receiptArea = receiptAreas.isEmpty() ? null : receiptAreas.get(0);
+//// List<WarehouseAreasItem> items = new ArrayList<>();
+// for (WkOrderItem item : orderItems) {
+//// Long areaId = receiptArea == null ? null : receiptArea.getId();
+//// String areaName = receiptArea == null ? null : receiptArea.getName();
+//// WarehouseAreasItem param = new WarehouseAreasItem();
+//// BeanUtils.copyProperties(item, param);
+//// param.setAsnCode(order.getCode()).setAsnId(order.getId());
+//// if (areaId != null) {
+//// param.setAreaId(areaId).setAreaName(areaName);
+//// }
+//// items.add(param);
+//// Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
+//// if (Objects.isNull(matnr)) {
+//// throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+//// }
+//// if (receiptArea != null) {
+//// try {
+//// updateReceipt(receiptArea, item, order, matnr);
+//// } catch (Exception e) {
+//// throw new CoolException(e.getMessage());
+//// }
+//// }
+// if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>().set(WkOrderItem::getQty, item.getAnfme()).eq(WkOrderItem::getId, item.getId()))) {
+// throw new CoolException("鏀惰揣鍗曟槑缁嗗畬鎴愭暟閲忎慨鏀瑰け璐ワ紒锛�");
+// }
+// }
+//// if (!warehouseAreasItemService.saveBatch(items)) {
+//// throw new CoolException("鏀惰揣鍗曚繚瀛樿嚦鏀惰揣鍖烘墽琛屽け璐ワ紒锛�");
+//// }
+//
+// if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+// .set(WkOrder::getQty, order.getAnfme())
+// .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
+// .eq(WkOrder::getId, order.getId()))) {
+// throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+// }
+// }
+// }
+// }
- /**
+ /** 鏀惰揣鍖哄凡鍋滅敤锛屾柟娉曟暣浣撴敞閲�
* @author Ryan
* @date 2025/5/12
* @description: 鏀惰揣鍖哄簱瀛樻洿鏂�
- * @version 1.0
*/
- private void extracted(WarehouseAreas areasItem, AsnOrderItem orderItem, WkOrder wkOrder, 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(wkOrder.getCode())
- .setAsnId(wkOrder.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());
- Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
- item.setAnfme(anfme);
- }
- //鏈川妫�
- if (!warehouseAreasItemService.saveOrUpdate(item)) {
- throw new CoolException("鏀惰揣澶辫触锛侊紒");
- }
- }
+// @Transactional(rollbackFor = Exception.class)
+// public void updateReceipt(WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, Matnr matnr) throws Exception {
+// 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(wkOrder.getCode())
+// .setAsnId(wkOrder.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());
+// List<WarehouseAreasItem> warehousList = StringUtils.isNotBlank(orderItem.getFieldsIndex())
+// ? warehouseAreasItemService.list(new LambdaQueryWrapper<WarehouseAreasItem>().eq(WarehouseAreasItem::getFieldsIndex, orderItem.getFieldsIndex()))
+// : Collections.emptyList();
+// WarehouseAreasItem warehousItem = warehousList.isEmpty() ? null : warehousList.get(0);
+// if (!Objects.isNull(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.isNull(fieldsItem)) {
+// throw new CoolException("绁ㄥ彿锛�" + fieldsItem.getValue() + "宸插湪鏀惰揣鍖猴紝涓嶅彲鎺ㄩ�佺浉褰撶エ鍙锋暟鎹�傝鑱旂郴绠＄悊鍛橈紒锛�" );
+// }
+// }
+// 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());
+// }
+// List<WarehouseAreasItem> serviceList = warehouseAreasItemService.list(queryWrapper);
+// WarehouseAreasItem serviceOne = serviceList.isEmpty() ? null : serviceList.get(0);
+// if (!Objects.isNull(serviceOne)) {
+// item.setId(serviceOne.getId());
+// item.setAnfme(orderItem.getAnfme());
+// }
+// if (!warehouseAreasItemService.saveOrUpdate(item)) {
+// throw new CoolException("鏀惰揣澶辫触锛侊紒");
+// }
+// }
/**
@@ -231,9 +265,9 @@
if (!asnOrderService.save(order)) {
throw new CoolException("ASN鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
items.forEach(item -> {
- AsnOrderItem orderItem = new AsnOrderItem();
+ WkOrderItem orderItem = new WkOrderItem();
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, item.getMatnrCode()));
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氬綋鍓嶇墿鏂欎笉瀛樺湪!!");
@@ -244,10 +278,10 @@
}
// String barcode = code + matnr.getCode();
orderItem.setAnfme(item.getAnfme())
- .setAsnId(order.getId())
+ .setOrderId(order.getId())
.setQty(item.getQty())
.setSplrName(item.getSplrName())
- .setAsnCode(code)
+ .setOrderCode(code)
.setSplrCode(item.getSplrCode())
.setPoDetlId(item.getId())
.setPlatItemId(item.getPlatItemId())
@@ -284,13 +318,13 @@
@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));
+ List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .isNull(WkOrderItem::getTrackCode)
+ .select(WkOrderItem::getId));
if (Objects.isNull(list) || list.isEmpty()) {
return;
}
- List<AsnOrderItem> items = new ArrayList<>();
+ List<WkOrderItem> items = new ArrayList<>();
list.forEach(item -> {
String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
if (StringUtils.isBlank(trackCode)) {
--
Gitblit v1.9.1