Merge remote-tracking branch 'origin/dev-ty1.2' into dev-ty1.2

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailPO.java

@@ -495,4 +495,12 @@ public class ExecutionInMaterialDetailPO extends ExecutionStockInOrderBasePO {
     //申报总价
     private BigDecimal amountGw;
     private String khdm;
+
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型")
+    private Integer goodsType;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java

@@ -3,6 +3,8 @@ package com.mhd.oms.domain.executionInMaterialDetail.repository.po;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 入库明细查询结果（关联入库执行单）
  *
@@ -27,4 +29,7 @@ public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDet
 
     @ApiModelProperty("货主名称")
     private String orderShipperName;
+
+    @ApiModelProperty("入库日期")
+    private Date warehouseDate;
 }

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

@@ -1127,6 +1127,10 @@ public class ReservationStockOutOrderDomainService {
         reservationStockInOrderMapper.updateByTransportationNumber(transportationNumber);
         LoginUser loginUser = SecurityUtils.getLoginUser();
         BusinessDeliveryDetailsLink businessDeliveryDetailsLink = businessDeliveryDetailsLinkService.getOne(new QueryWrapper<BusinessDeliveryDetailsLink>().lambda().eq(BusinessDeliveryDetailsLink::getInvoiceNumber, invoiceNumber), false);
+        List<BusinessDeliveryDetailsLink> businessDeliveryDetailsLinks = businessDeliveryDetailsLinkService.list(new QueryWrapper<BusinessDeliveryDetailsLink>().lambda().eq(BusinessDeliveryDetailsLink::getInvoiceNumber, invoiceNumber));
+        if (businessDeliveryDetailsLinks!=null&&businessDeliveryDetailsLinks.size()>1) {
+            throw new ServiceException("存在发票号重复情况,请检查!");
+        }
         if (businessDeliveryDetailsLink != null) {
             businessDeliveryDetailsLink.setIsReturn(1); // 1表示已退货
             businessDeliveryDetailsLink.setUpdateBy(loginUser.getUserPo().getUserId());
@@ -1135,6 +1139,9 @@ public class ReservationStockOutOrderDomainService {
             businessDeliveryDetailsLinkService.updateById(businessDeliveryDetailsLink);
 //            String invoiceNumber1 = businessDeliveryDetailsLink.getInvoiceNumber();
             List<ReservationDeliveryDetailsLink> list = reservationDeliveryDetailsLinkService.list(new QueryWrapper<ReservationDeliveryDetailsLink>().lambda().eq(ReservationDeliveryDetailsLink::getInvoiceNumber, invoiceNumber));
+            if (list != null && !list.isEmpty() && list.size()>1) {
+                throw new ServiceException("存在发票号重复情况,请检查!");
+            }
             if (list != null && !list.isEmpty() && list.size()>0) {
                 ReservationDeliveryDetailsLink reservationDeliveryDetailsLink = list.get(0);
                 String orderNumber = reservationDeliveryDetailsLink.getOrderNumber();
@@ -1163,8 +1170,7 @@ public class ReservationStockOutOrderDomainService {
                     reservationStockInOrder.setOrderTypeCode("tui_huo_ru_ku");
                     reservationStockInOrder.setBusinessType("tui_huo_ru_ku");
                     reservationStockInOrder.setReservationOrderSource("系统生成");
-                    reservationStockInOrder.setQuantity(new BigDecimal(bag));
-//                    reservationStockInOrder.setInQuantity(new BigDecimal(bag));
+//                    reservationStockInOrder.setQuantity(new BigDecimal(bag));
                     reservationStockInOrder.setRemark("发票号: "+invoiceNumber);
                     reservationStockInOrder.setDirectWarehouse(1);
                     reservationStockInOrder.setCloseOrder(2);
@@ -1246,14 +1252,28 @@ public class ReservationStockOutOrderDomainService {
 
     /**
      * 生成出库预约单号：
+     * 生成后校验数据库中是否已存在，存在则序号加一，直至不重复为止
      */
     public String generateReserveOrderNumber() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
         String datePart = sdf.format(new Date());
         String prefix = "C" + datePart;
         int todayCount = reservationStockOutOrderMapper.countByOrderNumberPrefix(prefix);
-        String seq = String.format("%03d", todayCount + 1);
-        return prefix + seq;
+        int seq = todayCount + 1;
+        String orderNumber;
+        do {
+            orderNumber = prefix + String.format("%03d", seq);
+            Integer count = reservationStockOutOrderMapper.selectCount(
+                    new LambdaQueryWrapper<ReservationStockOutOrder>()
+                            .eq(ReservationStockOutOrder::getOutOrderNumber, orderNumber)
+            );
+            if (count != null && count > 0) {
+                seq++;
+            } else {
+                break;
+            }
+        } while (true);
+        return orderNumber;
     }
 
     public String generateReserveOrderNumber1() {

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/vo/ReservedInventory.java

@@ -1,5 +1,6 @@
 package com.mhd.oms.domain.reserveStockInOrder.repository.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.mhd.oms.domain.reserveStockInOrder.repository.util.StringToBigDecimalConverter;
@@ -68,4 +69,10 @@ public class ReservedInventory {
      * 验证结果（导入后自动填充，不映射Excel）
      */
     private String validationResult;
+
+    /**
+     * WMS物料id（解析预览接口根据货物名称匹配后自动填充，匹配不到为空，不映射Excel）
+     */
+    @ExcelIgnore
+    private Long materialBaseInfoId;
 }

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

@@ -1981,6 +1981,35 @@ public class ReserveStockInOrderApplicationService {
         return stockInOrderDomainService.queryNoticePrintDetail(stockInOrderDO);
     }
 
+    /**
+     * Excel解析预览：根据货物名称匹配WMS对应物料并填充物料id，
+     * 匹配不到物料id保持为空，不阻断解析
+     */
+    public void fillMaterialBaseInfoId(List<ReservedInventory> dataList) {
+        if (dataList == null || dataList.isEmpty()) {
+            return;
+        }
+        // 物料名称匹配结果缓存，避免同名重复查库
+        Map<String, MaterialBaseInfoPO> materialCache = new HashMap<>();
+        for (ReservedInventory reservedInventory : dataList) {
+            String goodsName = reservedInventory.getGoodsName();
+            if (StringUtils.isBlank(goodsName)) {
+                continue;
+            }
+            MaterialBaseInfoPO materialBaseInfoPO = materialCache.get(goodsName);
+            if (materialBaseInfoPO == null && !materialCache.containsKey(goodsName)) {
+                List<MaterialBaseInfoPO> materialBaseInfoPOS = reserveStockInOrderMapper.getByName(goodsName);
+                if (materialBaseInfoPOS != null && !materialBaseInfoPOS.isEmpty()) {
+                    materialBaseInfoPO = materialBaseInfoPOS.get(0);
+                }
+                materialCache.put(goodsName, materialBaseInfoPO);
+            }
+            if (materialBaseInfoPO != null) {
+                reservedInventory.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
+            }
+        }
+    }
+
     public void importInData(List<ReservedInventory> dataList) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         ReserveStockInOrderDO reserveStockInOrder =  new ReserveStockInOrderDO();

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java

@@ -444,4 +444,9 @@ public class ReserveStockOutOrder extends BaseVOEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
 
+    @ApiModelProperty("预约业务类型")
+    private String reserveBusinessType;
+    @ApiModelProperty("预约业务类型名称")
+    private String reserveBusinessTypeName;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java

@@ -452,4 +452,8 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
+    @ApiModelProperty("预约业务类型")
+    private String reserveBusinessType;
+    @ApiModelProperty("预约业务类型名称")
+    private String reserveBusinessTypeName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java

@@ -490,4 +490,8 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
+    @ApiModelProperty("预约业务类型")
+    private String reserveBusinessType;
+    @ApiModelProperty("预约业务类型名称")
+    private String reserveBusinessTypeName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java

@@ -479,4 +479,8 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date outboundTime;
+    @ApiModelProperty("预约业务类型")
+    private String reserveBusinessType;
+    @ApiModelProperty("预约业务类型名称")
+    private String reserveBusinessTypeName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/vo/ReservedInventoryOut.java

@@ -1,5 +1,6 @@
 package com.mhd.oms.domain.reserveStockOutOrder.repository.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.mhd.oms.domain.reserveStockInOrder.repository.util.StringToBigDecimalConverter;
 import com.mhd.oms.domain.reserveStockInOrder.repository.util.StringToDateConverter;
@@ -35,6 +36,19 @@ public class ReservedInventoryOut {
 
     /**
      * 验证结果（导入后自动填充，不映射Excel）
+     * @ExcelIgnore：排除在Excel列映射之外，避免被自动分配列索引
      */
+    @ExcelIgnore
     private String validationResult;
+
+    /**
+     * WMS库存id（解析预览接口根据货物名称查询可用库存后自动填充，不映射Excel）
+     * @ExcelIgnore：Long类型字段若被自动映射到非数字列，会抛出ExcelDataConvertException
+     */
+    @ExcelIgnore
+    private Long materialInventoryId;
+
+
+    @ExcelIgnore
+    private Long materialBaseInfoId;
 }

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

@@ -847,7 +847,7 @@ public class ReserveStockOutOrderApplicationService {
      * @description 审核入库单
      * @author ZhouGY
      * @date 2024/5/21 13:53
-     * @param stockInOrderDO
+     * @param stockOutOrderDO
      * @return Boolean
      */
     public Boolean auditState(ReserveStockOutOrderDO stockOutOrderDO){
@@ -858,7 +858,7 @@ public class ReserveStockOutOrderApplicationService {
      * @description 下发入库单
      * @author ZhouGY
      * @date 2024/5/21 13:53
-     * @param stockInOrderDO
+     * @param stockOutOrderDO
      * @return Boolean
      */
     public Boolean issueOrder(ReserveStockOutOrderDO stockOutOrderDO){
@@ -868,7 +868,7 @@ public class ReserveStockOutOrderApplicationService {
      * @description 审核入库单
      * @author ZhouGY
      * @date 2024/5/21 13:53
-     * @param stockInOrderDO
+     * @param stockOutOrderDO
      * @return Boolean
      */
     public Boolean orderReject(ReserveStockOutOrderDO stockOutOrderDO){
@@ -1361,6 +1361,43 @@ public class ReserveStockOutOrderApplicationService {
         return result;
     }
 
+    /**
+     * Excel解析预览：根据货物名称查询WMS对应物料的库存信息，
+     * 可用数量大于导入数据件数的填充库存id；
+     * 物料不存在、无库存或可用数量不足时库存id保持为空，不抛异常
+     */
+    public void fillMaterialInventoryId(List<ReservedInventoryOut> dataList) {
+        if (CollectionUtils.isEmpty(dataList)) {
+            return;
+        }
+        for (ReservedInventoryOut reservedInventory : dataList) {
+            String goodsName = reservedInventory.getGoodsName();
+            BigDecimal importQuantity = reservedInventory.getQuantity() == null ? BigDecimal.ZERO : reservedInventory.getQuantity();
+            // 根据货物名称查询对应物料，匹配不到则库存id为空
+            List<MaterialBaseInfoPO> materialBaseInfoPOS = reserveStockInOrderMapper.getByName(goodsName);
+            if (materialBaseInfoPOS == null || materialBaseInfoPOS.isEmpty()) {
+                continue;
+            }
+            Long materialBaseInfoId = materialBaseInfoPOS.get(0).getMaterialBaseInfoId();
+            // 根据物料id查询对应库存，无库存则库存id为空
+            List<ReservationMaterialInventory> reservationMaterialInventories = reservationMaterialInventoryMapper.selectList(
+                    new LambdaQueryWrapper<ReservationMaterialInventory>()
+                            .eq(ReservationMaterialInventory::getMaterialBaseInfoId, materialBaseInfoId));
+            if (reservationMaterialInventories == null || reservationMaterialInventories.isEmpty()) {
+                continue;
+            }
+            // 取可用数量大于导入数据件数的库存，填充库存id；都不满足则库存id为空
+            for (ReservationMaterialInventory inventory : reservationMaterialInventories) {
+                BigDecimal allocationQuantity = inventory.getAllocationQuantity() == null ? BigDecimal.ZERO : inventory.getAllocationQuantity();
+                if (allocationQuantity.compareTo(importQuantity) > 0) {
+                    reservedInventory.setMaterialInventoryId(inventory.getMaterialInventoryId());
+                    reservedInventory.setMaterialBaseInfoId(inventory.getMaterialBaseInfoId());
+                    break;
+                }
+            }
+        }
+    }
+
     public void importInData(List<ReservedInventoryOut> dataList) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         ReserveStockOutOrderDO reserveStockOutOrder =  new ReserveStockOutOrderDO();

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReserveStockOutOrder/ReserveStockOutOrderApi.java

@@ -296,6 +296,31 @@ public class ReserveStockOutOrderApi extends BaseController {
         }
     }
 
+    /**
+     * 仅解析Excel文件内容并返回，不执行入库
+     * 同时根据货物名称查询WMS对应物料库存，可用数量大于件数的返回库存id，匹配不到库存id返回空
+     */
+    @ApiOperation("解析导入Excel（仅解析不入库）")
+    @PostMapping("/parseExcel")
+    public ResponseEntity<Map<String, Object>> parseExcel(@RequestParam("file") MultipartFile file) {
+        List<ReservedInventoryOut> dataList = null;
+        try {
+            dataList = ExcelParseUtil.parseExcel(file);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        // 根据货物名称查询WMS库存并填充库存id，匹配不到库存id返回空
+            stockOutOrderApplicationService.fillMaterialInventoryId(dataList);
+
+            Map<String, Object> successResponse = new HashMap<>();
+            successResponse.put("code", 200);
+            successResponse.put("message", "Excel解析成功");
+            successResponse.put("dataCount", dataList.size());
+            successResponse.put("details", dataList);
+            return ResponseEntity.ok(successResponse);
+    }
+
     /**
      * 生成出库预约单号
      */

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reserveStockInOrder/ReserveStockInOrderApi.java

@@ -260,6 +260,52 @@ public class ReserveStockInOrderApi extends BaseController {
         }
     }
 
+    /**
+     * 仅解析Excel文件内容并返回，不执行入库
+     * 同时根据货物名称匹配WMS物料并返回物料id，匹配不到返回空
+     */
+    @ApiOperation("解析导入Excel（仅解析不入库）")
+    @PostMapping("/parseExcel")
+    public ResponseEntity<Map<String, Object>> parseExcel(@RequestParam("file") MultipartFile file) {
+        try {
+            List<ReservedInventory> dataList = ExcelParseUtil.parseExcel(file);
+
+            // 根据货物名称匹配WMS物料并填充物料id，匹配不到返回空
+            stockInOrderApplicationService.fillMaterialBaseInfoId(dataList);
+
+            Map<String, Object> successResponse = new HashMap<>();
+            successResponse.put("code", 200);
+            successResponse.put("message", "Excel解析成功");
+            successResponse.put("dataCount", dataList.size());
+            successResponse.put("details", dataList);
+            return ResponseEntity.ok(successResponse);
+
+        } catch (ValidationException e) {
+            // 数据验证失败响应
+            Map<String, Object> errorResponse = new HashMap<>();
+            errorResponse.put("code", 400);
+            errorResponse.put("message", "数据验证失败");
+            errorResponse.put("errorDetails", e.getMessage());
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse);
+
+        } catch (IOException e) {
+            // 文件处理失败响应
+            Map<String, Object> errorResponse = new HashMap<>();
+            errorResponse.put("code", 500);
+            errorResponse.put("message", "文件处理失败");
+            errorResponse.put("errorDetails", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
+
+        } catch (Exception e) {
+            // 其他未知错误响应
+            Map<String, Object> errorResponse = new HashMap<>();
+            errorResponse.put("code", 500);
+            errorResponse.put("message", e.getMessage());
+            errorResponse.put("errorDetails", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
+        }
+    }
+
     /**
      * 老系统入库预约单数据导入（主表+明细两个Excel文件批量导入，按名称匹配基础数据）
      */

mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml

@@ -97,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpCurrGw"    column="erp_curr_gw"    />
         <result property="erpPriceGw"    column="erp_price_gw"    />
         <result property="amountGw"    column="amount_gw"    />
+        <result property="insureAmount"    column="insure_amount"    />
+        <result property="goodsType"    column="goods_type"    />
     </resultMap>
 
 
@@ -366,6 +368,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderShipperId"      column="order_shipper_id"      />
         <result property="orderShipperCode"    column="order_shipper_code"    />
         <result property="orderShipperName"    column="order_shipper_name"    />
+        <result property="warehouseDate"       column="warehouse_date"        />
     </resultMap>
 
     <select id="queryInOrderDetailList" parameterType="com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO"
@@ -400,13 +403,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.single_volume, a.single_gross_weight, a.lot_no,
         a.drink_date, a.fire_insure_fee, a.unit_price,
         a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw, a.erp_curr_gw, a.erp_price_gw, a.amount_gw,
+        c.insure_amount, c.goods_type,
         b.shipper_id as order_shipper_id,
         b.shipper_code as order_shipper_code,
         b.shipper_name as order_shipper_name,
         b.status as in_order_status,
-        b.audit_status as in_order_audit_status
+        b.audit_status as in_order_audit_status,
+        b.warehouse_date
         from execution_in_material_detail a
         left join execution_stock_in_order b on a.in_order_number = b.in_order_number
+        left join material_base_info c on a.material_base_info_id = c.material_base_info_id
         <where>
             <if test="organizationId != null ">
                 and a.organization_id = #{organizationId}

mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml

@@ -835,7 +835,7 @@
     <select id="getMaxStockInOrderByPrefixAndOrgAndWarehouse" resultType="java.lang.String">
         SELECT in_order_number FROM reserve_stock_in_order
         WHERE in_order_number LIKE concat(#{prefix}, '%')
-          AND del_flag = 1
+
           <if test="organizationId != null">
               AND organization_id = #{organizationId}
           </if>
@@ -847,7 +847,7 @@
 
         SELECT in_order_number FROM reservation_stock_in_order
         WHERE in_order_number LIKE concat(#{prefix}, '%')
-          AND del_flag = 1
+
           <if test="organizationId != null">
               AND organization_id = #{organizationId}
           </if>
@@ -859,7 +859,7 @@
 
         SELECT in_order_number FROM execution_stock_in_order
         WHERE in_order_number LIKE concat(#{prefix}, '%')
-          AND del_flag = 1
+
           <if test="organizationId != null">
               AND organization_id = #{organizationId}
           </if>
@@ -871,7 +871,7 @@
 
         SELECT in_order_number FROM NGWL_TEST_WMS.stock_in_order
         WHERE in_order_number LIKE concat(#{prefix}, '%')
-          AND del_flag = 1
+
           <if test="organizationId != null">
               AND organization_id = #{organizationId}
           </if>

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

@@ -95,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reservationOrderSource"    column="RESERVATION_ORDER_SOURCE"    />
         <result property="outboundTime"    column="OUTBOUND_TIME"    />
         <result property="businessOrderNo"    column="BUSINESS_ORDER_NO"    />
+        <result property="reserveBusinessType"    column="RESERVE_BUSINESS_TYPE"    />
+        <result property="reserveBusinessTypeName"    column="RESERVE_BUSINESS_TYPE_NAME"    />
     </resultMap>
 
 
@@ -112,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
-        a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME
+        a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.RESERVE_BUSINESS_TYPE,a.RESERVE_BUSINESS_TYPE_NAME
     </sql>
 
 
@@ -132,6 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="outOrderId != null ">
             and a.out_order_id = #{outOrderId}
         </if>
+        <if test="reserveBusinessType != null ">
+            and a.reserve_business_type = #{reserveBusinessType}
+        </if>
         <if test="organizationId != null ">
             and a.organization_id = #{organizationId}
         </if>
@@ -553,7 +558,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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>
@@ -565,7 +570,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         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>
@@ -577,7 +582,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         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>
@@ -589,7 +594,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         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>