出库单按规则生成;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -122,17 +122,75 @@ public class ReservationStockOutOrderDomainService {
     public List<ReservationStockOutOrderPO> queryList(ReservationStockOutOrderDO stockOutOrderDO) {
         return stockOutOrderService.queryList(stockOutOrderDO);
     }
-
+    /**
+     * 从单号列表中提取最大序号
+     * 单号格式: prefix + 数字序号（如 RK260807001 中 prefix=RK260807, 序号=001）
+     * 即使中间有删单，也能保证序号递增不重复
+     *
+     * @param orderNumbers 匹配的单号列表
+     * @param prefixLength 前缀长度（序号从该位置开始截取）
+     * @return 最大序号值，列表为空时返回0
+     */
+    private int extractMaxSequenceNumber(List<String> orderNumbers, int prefixLength) {
+        if (orderNumbers == null || orderNumbers.isEmpty()) {
+            return 0;
+        }
+        int maxSeq = 0;
+        for (String orderNumber : orderNumbers) {
+            if (orderNumber != null && orderNumber.length() > prefixLength) {
+                try {
+                    String seqStr = orderNumber.substring(prefixLength);
+                    int seq = Integer.parseInt(seqStr);
+                    if (seq > maxSeq) {
+                        maxSeq = seq;
+                    }
+                } catch (NumberFormatException e) {
+                    // 序号部分非数字，跳过
+                }
+            }
+        }
+        return maxSeq;
+    }
 
     /**
      * 新增出库单
      */
     @Transactional(rollbackFor = Exception.class)
     public Boolean insert(ReservationStockOutOrderDO stockOutOrderDO) {
-        if (stockOutOrderDO.getOutOrderNumber() == null) {
+
-            stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
+        //设置单号
-            stockOutOrderDO.setBusinessOrderNo(stockOutOrderDO.getOutOrderNumber());
+        Long warehouseId = stockOutOrderDO.getWarehouseId();
+        AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId);
+        if (!"200".equals(String.valueOf(ajaxResult.get("code")))) {
+            throw new ServiceException("获取仓库信息失败");
         }
+        //仓库信息
+        WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class);
+        String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule();
+        String prefix = warehouseFeignPO.getInOrderNoPrefix();
+        if (prefix == null || prefix.isEmpty()) {
+            prefix = "RK";
+        }
+        Long organizationId = stockOutOrderDO.getOrganizationId();
+        Long warehouseIdForCount = stockOutOrderDO.getWarehouseId();
+        if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) {
+            //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1
+            String dateStr = new SimpleDateFormat("yyMMdd").format(new Date());
+            String datePrefix = prefix + dateStr;
+            List<String> orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount);
+            int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length());
+            String seq = String.format("%03d", maxSeq + 1);
+            stockOutOrderDO.setOutOrderNumber(datePrefix + seq);
+            stockOutOrderDO.setBusinessOrderNo(datePrefix + seq);
+        } else {
+            //历史累加: 前缀 + 历史最大序号+1
+            List<String> orderNumbers = reserveStockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount);
+            int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length());
+            String seq = String.format("%03d", maxSeq + 1);
+            stockOutOrderDO.setOutOrderNumber(prefix + seq);
+            stockOutOrderDO.setBusinessOrderNo(prefix + seq);
+        }
+
         // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
         setMaterialDetailInfo(stockOutOrderDO);
         stockOutOrderDO.setMaterialQuantity(stockOutOrderDO.getMaterialDetailList().size());

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderDomainService.java

@@ -103,7 +103,7 @@ public class ReserveStockInOrderDomainService {
      */
     @Transactional(rollbackFor = Exception.class)
     public Boolean insert(ReserveStockInOrderDO stockInOrderDO) {
-        if (stockInOrderDO.getInOrderNumber() == null) {
+//        if (stockInOrderDO.getInOrderNumber() == null) {
         Long warehouseId = stockInOrderDO.getWarehouseId();
         AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId);
         if (!"200".equals(String.valueOf(ajaxResult.get("code")))) {
@@ -126,14 +126,16 @@ public class ReserveStockInOrderDomainService {
             int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length());
             String seq = String.format("%03d", maxSeq + 1);
             stockInOrderDO.setInOrderNumber(datePrefix + seq);
+            stockInOrderDO.setBusinessOrderNo(datePrefix + seq);
         } else {
             //历史累加: 前缀 + 历史最大序号+1
             List<String> orderNumbers = reservationStockInOrderMapper.getMaxStockInOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount);
             int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length());
             String seq = String.format("%03d", maxSeq + 1);
             stockInOrderDO.setInOrderNumber(prefix + seq);
+            stockInOrderDO.setBusinessOrderNo(prefix + seq);
         }
-        }
+//        }
 //        //设置默认值
 //        setDefaultValues(stockInOrderDO);
 //        //设置物料信息

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java

@@ -50,4 +50,12 @@ public interface ReserveStockOutOrderMapper extends BaseMapper<ReserveStockOutOr
      * @param warehouseType 仓库类型编码（如 "1"/"2"）
      */
     List<WarehousePO> getWarehouseByType(@Param("warehouseType") String warehouseType);
+
+    /**
+     * 跨4张入库单表查询指定前缀+组织+仓库的所有入库单号（用于取最大序号+1，防止删单后单号重复）
+     * 包含: reserve_stock_in_order, reservation_stock_in_order, execution_stock_in_order, WMS stock_in_order
+     */
+    List<String> getMaxStockOutOrderByPrefixAndOrgAndWarehouse(@Param("prefix") String prefix,
+                                                               @Param("organizationId") Long organizationId,
+                                                               @Param("warehouseId") Long warehouseId);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderDomainService.java

@@ -7,6 +7,7 @@ import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.utils.bean.BeanUtils;
+import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
 import com.mhd.oms.domain.reservationInMaterialDetail.entity.ReservationInMaterialDetail;
@@ -34,10 +35,7 @@ import com.mhd.oms.domain.reserveStockOutOrder.repository.po.ReserveStockOutOrde
 import com.mhd.oms.domain.reserveStockOutOrder.repository.todo.ReserveStockOutOrderDO;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.WmsServiceFeign;
-import com.mhd.system.api.domain.OutMaterialDetail;
+import com.mhd.system.api.domain.*;
-import com.mhd.system.api.domain.OutMaterialDetailTZPD;
-import com.mhd.system.api.domain.StockOutOrder;
-import com.mhd.system.api.domain.StockOutOrderTZPD;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +76,8 @@ public class ReserveStockOutOrderDomainService {
 
     @Autowired
     private ReservationStockOutOrderDomainService reservationStockOutOrderDomainService;
+    @Autowired
+    private SystemServiceFeign systemServiceFeign;
 
     /**
      * 分页查询出库单列表
@@ -90,15 +90,74 @@ public class ReserveStockOutOrderDomainService {
         return stockOutOrderService.detailsList(stockOutOrderDO);
     }
 
-
+    /**
+     * 从单号列表中提取最大序号
+     * 单号格式: prefix + 数字序号（如 RK260807001 中 prefix=RK260807, 序号=001）
+     * 即使中间有删单，也能保证序号递增不重复
+     *
+     * @param orderNumbers 匹配的单号列表
+     * @param prefixLength 前缀长度（序号从该位置开始截取）
+     * @return 最大序号值，列表为空时返回0
+     */
+    private int extractMaxSequenceNumber(List<String> orderNumbers, int prefixLength) {
+        if (orderNumbers == null || orderNumbers.isEmpty()) {
+            return 0;
+        }
+        int maxSeq = 0;
+        for (String orderNumber : orderNumbers) {
+            if (orderNumber != null && orderNumber.length() > prefixLength) {
+                try {
+                    String seqStr = orderNumber.substring(prefixLength);
+                    int seq = Integer.parseInt(seqStr);
+                    if (seq > maxSeq) {
+                        maxSeq = seq;
+                    }
+                } catch (NumberFormatException e) {
+                    // 序号部分非数字，跳过
+                }
+            }
+        }
+        return maxSeq;
+    }
     /**
      * 新增出库单
      */
     @Transactional(rollbackFor = Exception.class)
     public Boolean insert(ReserveStockOutOrderDO stockOutOrderDO) {
-        if (stockOutOrderDO.getOutOrderNumber() == null) {
+        //设置单号
-            stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
+        Long warehouseId = stockOutOrderDO.getWarehouseId();
+        AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoByWarehouseId(warehouseId);
+        if (!"200".equals(String.valueOf(ajaxResult.get("code")))) {
+            throw new ServiceException("获取仓库信息失败");
         }
+        //仓库信息
+        WarehouseFeignPO warehouseFeignPO = com.alibaba.fastjson.JSON.parseObject(com.alibaba.fastjson2.JSONObject.toJSONString(ajaxResult.get("data")), WarehouseFeignPO.class);
+        String orderNoGenerateRule = warehouseFeignPO.getOrderNoGenerateRule();
+        String prefix = warehouseFeignPO.getInOrderNoPrefix();
+        if (prefix == null || prefix.isEmpty()) {
+            prefix = "RK";
+        }
+        Long organizationId = stockOutOrderDO.getOrganizationId();
+        Long warehouseIdForCount = stockOutOrderDO.getWarehouseId();
+        if (orderNoGenerateRule != null && "0".equals(orderNoGenerateRule)) {
+            //日期累加: 前缀 + 当前日期yymmdd + 当天最大序号+1
+            String dateStr = new SimpleDateFormat("yyMMdd").format(new Date());
+            String datePrefix = prefix + dateStr;
+            List<String> orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(datePrefix, organizationId, warehouseIdForCount);
+            int maxSeq = extractMaxSequenceNumber(orderNumbers, datePrefix.length());
+            String seq = String.format("%03d", maxSeq + 1);
+            stockOutOrderDO.setOutOrderNumber(datePrefix + seq);
+            stockOutOrderDO.setBusinessOrderNo(datePrefix + seq);
+        } else {
+            //历史累加: 前缀 + 历史最大序号+1
+            List<String> orderNumbers = stockOutOrderMapper.getMaxStockOutOrderByPrefixAndOrgAndWarehouse(prefix, organizationId, warehouseIdForCount);
+            int maxSeq = extractMaxSequenceNumber(orderNumbers, prefix.length());
+            String seq = String.format("%03d", maxSeq + 1);
+            stockOutOrderDO.setOutOrderNumber(prefix + seq);
+            stockOutOrderDO.setBusinessOrderNo(prefix + seq);
+        }
+
+
         // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
         setMaterialDetailInfo(stockOutOrderDO);
         stockOutOrderDO.setMaterialQuantity(stockOutOrderDO.getMaterialDetailList().size());

mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml

@@ -548,4 +548,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           )
     </select>
 
+
+    <!-- 跨4张入库单表查询指定前缀+组织+仓库的所有入库单号（取最大序号+1，防止删单后单号重复） -->
+    <select id="getMaxStockOutOrderByPrefixAndOrgAndWarehouse" resultType="java.lang.String">
+        SELECT out_order_number FROM reserve_stock_out_order
+        WHERE out_order_number LIKE concat(#{prefix}, '%')
+        AND del_flag = 1
+        <if test="organizationId != null">
+            AND organization_id = #{organizationId}
+        </if>
+        <if test="warehouseId != null">
+            AND warehouse_id = #{warehouseId}
+        </if>
+
+        UNION ALL
+
+        SELECT out_order_number FROM reservation_stock_out_order
+        WHERE out_order_number LIKE concat(#{prefix}, '%')
+        AND del_flag = 1
+        <if test="organizationId != null">
+            AND organization_id = #{organizationId}
+        </if>
+        <if test="warehouseId != null">
+            AND warehouse_id = #{warehouseId}
+        </if>
+
+        UNION ALL
+
+        SELECT out_order_number FROM execution_stock_out_order
+        WHERE out_order_number LIKE concat(#{prefix}, '%')
+        AND del_flag = 1
+        <if test="organizationId != null">
+            AND organization_id = #{organizationId}
+        </if>
+        <if test="warehouseId != null">
+            AND warehouse_id = #{warehouseId}
+        </if>
+
+        UNION ALL
+
+        SELECT out_order_number FROM NGWL_TEST_WMS.stock_out_order
+        WHERE out_order_number LIKE concat(#{prefix}, '%')
+        AND del_flag = 1
+        <if test="organizationId != null">
+            AND organization_id = #{organizationId}
+        </if>
+        <if test="warehouseId != null">
+            AND warehouse_id = #{warehouseId}
+        </if>
+    </select>
+
 </mapper>