weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
王奎兴
2026-08-12 15:20:46 +08:00
parent 1d01431354 cbaab0ffee
commit 208024a6cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
+2 -2
View File
@@ -173,7 +173,7 @@ public class StockReceiptOrderDomainService {
stockReceiptOrderDOList.forEach(stockReceiptOrderDO -> { stockReceiptOrderDOList.forEach(stockReceiptOrderDO -> {
StockReceiptOrder stockReceiptOrder = JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDO), StockReceiptOrder.class); StockReceiptOrder stockReceiptOrder = JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDO), StockReceiptOrder.class);
// 仓库以入库单为准；delive_task 在 genDeliveTask 中从 stock_in_order 读取。收货单实体仓库字段 exist=false 不落库。 // 仓库以入库单为准；delive_task 在 genDeliveTask 中从 stock_in_order 读取。收货单实体仓库字段 exist=false 不落库。
stockReceiptOrder.setReceiptOrderNumber(OrderSequence.getOrderCode("SH")); stockReceiptOrder.setReceiptOrderNumber("RV-"+stockReceiptOrderDO.getInOrderNumber());
stockReceiptOrder.setCreateBy(loginUser.getUserid()); stockReceiptOrder.setCreateBy(loginUser.getUserid());
stockReceiptOrder.setCreateByName(userRealName); stockReceiptOrder.setCreateByName(userRealName);
stockReceiptOrder.setCreateTime(new Date()); stockReceiptOrder.setCreateTime(new Date());
@@ -1583,7 +1583,7 @@ public class StockReceiptOrderDomainService {
} else { } else {
stockShelfOrderDO.setTaskDistributionTime(null); stockShelfOrderDO.setTaskDistributionTime(null);
} }
stockShelfOrderDO.setShelfOrderNumber(OrderSequence.getOrderCode("SJ")); stockShelfOrderDO.setShelfOrderNumber("SH-"+stockReceiptOrderPO.getInOrderNumber());
stockShelfOrderDO.setStatus(1); stockShelfOrderDO.setStatus(1);
//本次上架数量 //本次上架数量
BigDecimal receiptQuantity = BigDecimal.ZERO; BigDecimal receiptQuantity = BigDecimal.ZERO;