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

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java

@@ -173,7 +173,7 @@ public class StockReceiptOrderDomainService {
         stockReceiptOrderDOList.forEach(stockReceiptOrderDO -> {
             StockReceiptOrder stockReceiptOrder = JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDO), StockReceiptOrder.class);
             // 仓库以入库单为准；delive_task 在 genDeliveTask 中从 stock_in_order 读取。收货单实体仓库字段 exist=false 不落库。
-            stockReceiptOrder.setReceiptOrderNumber(OrderSequence.getOrderCode("SH"));
+            stockReceiptOrder.setReceiptOrderNumber("RV-"+stockReceiptOrderDO.getInOrderNumber());
             stockReceiptOrder.setCreateBy(loginUser.getUserid());
             stockReceiptOrder.setCreateByName(userRealName);
             stockReceiptOrder.setCreateTime(new Date());
@@ -1583,7 +1583,7 @@ public class StockReceiptOrderDomainService {
         } else {
             stockShelfOrderDO.setTaskDistributionTime(null);
         }
-        stockShelfOrderDO.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
+        stockShelfOrderDO.setShelfOrderNumber("SH-"+stockReceiptOrderPO.getInOrderNumber());
         stockShelfOrderDO.setStatus(1);
         //本次上架数量
         BigDecimal receiptQuantity = BigDecimal.ZERO;