添加功能

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

@@ -25,13 +25,8 @@ import com.nflg.wms.common.pojo.vo.*;
 import com.nflg.wms.common.util.EecExcelUtil;
 import com.nflg.wms.common.util.UserUtil;
 import com.nflg.wms.common.util.VUtil;
-import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
+import com.nflg.wms.repository.entity.*;
-import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
+import com.nflg.wms.repository.service.*;
-import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTrayItem;
-import com.nflg.wms.repository.service.IWmsStructuralPackageOrderService;
-import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayItemService;
-import com.nflg.wms.repository.service.IWmsStructuralPackageOrderTrayService;
-import com.nflg.wms.repository.service.IWmsStructuralPackageService;
 import com.nflg.wms.starter.BaseController;
 import com.nflg.wms.starter.service.FileUploadService;
 import jakarta.annotation.Resource;
@@ -88,6 +83,12 @@ public class StructuralPackageOrderController extends BaseController {
     @Resource
     private PackageMaterialScanRecordRepository packageMaterialScanRecordRepository;
 
+    @Resource
+    private IWmsStructuralPackageDeliverOrderService structuralPackageDeliverOrderService;
+
+    @Resource
+    private IWmsStructuralPackageDeliverOrderMapService structuralPackageDeliverOrderMapService;
+
     /**
      * 搜索SAP订单
      * @param request 请求参数
@@ -228,7 +229,7 @@ public class StructuralPackageOrderController extends BaseController {
      * 搜索
      */
     @PostMapping("search")
-    public ApiResult<PageData<DeliverStructuralPackageOrderVO>> search(@Valid @RequestBody DeliverStructuralPackageOrderSearchQO request) {
+    public ApiResult<PageData<DeliverStructuralPackageOrderVO>> search(@Valid @RequestBody StructuralPackageOrderSearchQO request) {
         return ApiResult.success(deliverStructuralPackageOrderService.search(request));
     }
 
@@ -287,7 +288,7 @@ public class StructuralPackageOrderController extends BaseController {
      * 根据订单状态搜索
      */
     @PostMapping("searchByState")
-    public ApiResult<PageData<DeliverStructuralPackageOrderExtendVO>> searchByState(@Valid @RequestBody DeliverStructuralPackageOrderSearchByStateQO request) {
+    public ApiResult<PageData<DeliverStructuralPackageOrderExtendVO>> searchByState(@Valid @RequestBody StructuralPackageOrderSearchByStateQO request) {
         return ApiResult.success(deliverStructuralPackageOrderTrayService.searchByState(request));
     }
 
@@ -308,7 +309,7 @@ public class StructuralPackageOrderController extends BaseController {
      * @param request 搜索参数
      */
     @PostMapping("exportSearchByState")
-    public void exportSearchByState(HttpServletResponse response,@Valid @RequestBody @NotNull DeliverStructuralPackageOrderSearchByStateQO request) throws IOException {
+    public void exportSearchByState(HttpServletResponse response,@Valid @RequestBody @NotNull StructuralPackageOrderSearchByStateQO request) throws IOException {
         List<DeliverStructuralPackageOrderExtendVO> list = deliverStructuralPackageOrderTrayService.searchByStateAll(request);
         if (CollectionUtil.isEmpty(list)){
             list.add(new DeliverStructuralPackageOrderExtendVO());
@@ -504,7 +505,44 @@ public class StructuralPackageOrderController extends BaseController {
         return ApiResult.success();
     }
 
+    /**
+     * 创建送货单
+     * @param ids 托盘id
+     */
+    @Transactional
+    @PostMapping("createDeliverOrder")
+    public ApiResult<Void> createDeliverOrder(@Valid @RequestBody @NotEmpty List<Long> ids) {
+        List<DeliverStructuralPackageOrderExtendVO> trays = deliverStructuralPackageOrderTrayService.getListByIds(ids);
+        VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getPackageNo).collect(Collectors.toSet()).size() > 1)
+                .throwMessage("钢构包必须一致");
+        VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getExternalOrderNo).collect(Collectors.toSet()).size() > 1)
+                .throwMessage("采购单号必须一致");
+        Long packageId = trays.get(0).getPackageId();
+        String externalOrderNo = trays.get(0).getExternalOrderNo();
+        Long supplierId=trays.get(0).getSupplierId();
+        List<Long> tids = deliverStructuralPackageOrderTrayService.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo);
+        VUtil.trueThrowBusinessError(tids.size() != ids.size()).throwMessage("数据未齐套");
+        String deliverOrderNo = RandomUtil.randomString(10);
+        WmsStructuralPackageDeliverOrder deliverOrder = new WmsStructuralPackageDeliverOrder()
+                .setNo(deliverOrderNo)
+                .setSupplierId(supplierId)
+                .setCreateBy(UserUtil.getUserName())
+                .setCreateTime(LocalDateTime.now());
+        structuralPackageDeliverOrderService.save(deliverOrder);
+        structuralPackageDeliverOrderMapService.saveBatch(ids.stream().map(id -> new WmsStructuralPackageDeliverOrderMap()
+                .setDeliverId(deliverOrder.getId())
+                .setOrderId(id)).toList());
+        return ApiResult.success();
+    }
 
+    /**
+     * 搜索送货单
+     * @param request 查询参数
+     */
+    @PostMapping("searchDeliverOrder")
+    public ApiResult<PageData<StructuralPackageDeliverOrderVO>> searchDeliverOrder(@Valid @RequestBody @NotNull StructuralPackageDeliverOrderSearchQO request){
+        return ApiResult.success(structuralPackageDeliverOrderService.search(request));
+    }
 
     /**
      * 根据送货单号查询订单信息

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java

@@ -0,0 +1,22 @@
+package com.nflg.wms.common.pojo.qo;
+
+import lombok.Data;
+
+@Data
+public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{
+
+    /**
+     * 送货单号
+     */
+    private String no;
+
+    /**
+     * 采购单号
+     */
+    private String externalOrderNo;
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+}

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchByStateQO.java

@@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Data
-public class DeliverStructuralPackageOrderSearchByStateQO extends SearchBaseQO{
+public class StructuralPackageOrderSearchByStateQO extends SearchBaseQO{
 
     /**
      * 订单状态

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderSearchQO.java

@@ -3,7 +3,7 @@ package com.nflg.wms.common.pojo.qo;
 import lombok.Data;
 
 @Data
-public class DeliverStructuralPackageOrderSearchQO extends SearchBaseQO {
+public class StructuralPackageOrderSearchQO extends SearchBaseQO {
 
     /**
      * 单据号

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StructuralPackageDeliverOrderVO.java

@@ -0,0 +1,63 @@
+package com.nflg.wms.common.pojo.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+public class StructuralPackageDeliverOrderVO {
+
+    private Long id;
+
+    /**
+     * 送货单号
+     */
+    private String no;
+
+    /**
+     * 状态，0：待收货；1：已收货；2-已完结；
+     */
+    private Short state;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 最后更新人
+     */
+    private String updateBy;
+
+    /**
+     * 最后更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
+     * 供应商代码
+     */
+    private Long supplierCode;
+
+    /**
+     * 供应商名称
+     */
+    private Long supplierName;
+
+    /**
+     * 工厂编号
+     */
+    private String factoryNo;
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java

@@ -0,0 +1,68 @@
+package com.nflg.wms.repository.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("wms_structural_package_deliver_order")
+public class WmsStructuralPackageDeliverOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 送货单号
+     */
+    private String no;
+
+    /**
+     * 状态，0：待收货；1：已收货；2-已完结；
+     */
+    private Short state;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 最后更新人
+     */
+    private String updateBy;
+
+    /**
+     * 最后更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrderMap.java

@@ -0,0 +1,42 @@
+package com.nflg.wms.repository.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("wms_structural_package_deliver_order_map")
+public class WmsStructuralPackageDeliverOrderMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 送货单id
+     */
+    private Long deliverId;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapMapper.java

@@ -0,0 +1,16 @@
+package com.nflg.wms.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrderMap;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+public interface WmsStructuralPackageDeliverOrderMapMapper extends BaseMapper<WmsStructuralPackageDeliverOrderMap> {
+
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageDeliverOrderMapper.java

@@ -0,0 +1,25 @@
+package com.nflg.wms.repository.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nflg.wms.common.pojo.qo.StructuralPackageDeliverOrderSearchQO;
+import com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO;
+import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrder;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+public interface WmsStructuralPackageDeliverOrderMapper extends BaseMapper<WmsStructuralPackageDeliverOrder> {
+
+    IPage<StructuralPackageDeliverOrderVO> search(StructuralPackageDeliverOrderSearchQO request, List<Long> externalOrderIds, Page<?> objectPage);
+
+    List<Long> getIdsByExternalOrderNo(String externalOrderNo);
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderMapper.java

@@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO;
+import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchQO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO;
 import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface WmsStructuralPackageOrderMapper extends BaseMapper<WmsStructuralPackageOrder> {
 
-    IPage<DeliverStructuralPackageOrderVO> search(DeliverStructuralPackageOrderSearchQO request, Page<?> objectPage);
+    IPage<DeliverStructuralPackageOrderVO> search(StructuralPackageOrderSearchQO request, Page<?> objectPage);
 
     List<DeliverStructuralPackageOrderVO> getList(String orderNo);
 

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java

@@ -3,7 +3,7 @@ package com.nflg.wms.repository.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO;
+import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchByStateQO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO;
 import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
@@ -21,9 +21,9 @@ import java.util.List;
  */
 public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper<WmsStructuralPackageOrderTray> {
 
-    IPage<DeliverStructuralPackageOrderExtendVO> searchByState(@Param("request") DeliverStructuralPackageOrderSearchByStateQO request, Page<?> objectPage);
+    IPage<DeliverStructuralPackageOrderExtendVO> searchByState(@Param("request") StructuralPackageOrderSearchByStateQO request, Page<?> objectPage);
 
-    List<DeliverStructuralPackageOrderExtendVO> searchByState(@Param("request") DeliverStructuralPackageOrderSearchByStateQO request);
+    List<DeliverStructuralPackageOrderExtendVO> searchByState(@Param("request") StructuralPackageOrderSearchByStateQO request);
 
     List<DeliverStructuralPackageOrderExtendVO> getListByIds(List<Long> ids);
 
@@ -32,4 +32,6 @@ public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper<WmsStruc
     String getLast(String key);
 
     DeliverStructuralPackageOrderTrayVO getInfoByNo(String no);
+
+    List<Long> getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderMapService.java

@@ -0,0 +1,16 @@
+package com.nflg.wms.repository.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrderMap;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+public interface IWmsStructuralPackageDeliverOrderMapService extends IService<WmsStructuralPackageDeliverOrderMap> {
+
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageDeliverOrderService.java

@@ -0,0 +1,22 @@
+package com.nflg.wms.repository.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.nflg.wms.common.pojo.qo.StructuralPackageDeliverOrderSearchQO;
+import com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO;
+import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrder;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+public interface IWmsStructuralPackageDeliverOrderService extends IService<WmsStructuralPackageDeliverOrder> {
+
+    IPage<StructuralPackageDeliverOrderVO> search(@Valid @NotNull StructuralPackageDeliverOrderSearchQO request);
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderService.java

@@ -2,7 +2,7 @@ package com.nflg.wms.repository.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO;
+import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchQO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO;
 import com.nflg.wms.repository.entity.WmsStructuralPackageOrder;
@@ -24,7 +24,7 @@ public interface IWmsStructuralPackageOrderService extends IService<WmsStructura
 
     void addOrUpdate(WmsStructuralPackageOrder order);
 
-    IPage<DeliverStructuralPackageOrderVO> search(@Valid DeliverStructuralPackageOrderSearchQO request);
+    IPage<DeliverStructuralPackageOrderVO> search(@Valid StructuralPackageOrderSearchQO request);
 
     List<DeliverStructuralPackageOrderVO> getList(@Valid @NotBlank String orderNo);
 

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsStructuralPackageOrderTrayService.java

@@ -2,7 +2,7 @@ package com.nflg.wms.repository.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO;
+import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchByStateQO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO;
 import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
@@ -28,9 +28,9 @@ public interface IWmsStructuralPackageOrderTrayService extends IService<WmsStruc
 
     void deleteByOrderIds(List<Long> deleteIds);
 
-    IPage<DeliverStructuralPackageOrderExtendVO> searchByState(@Valid DeliverStructuralPackageOrderSearchByStateQO request);
+    IPage<DeliverStructuralPackageOrderExtendVO> searchByState(@Valid StructuralPackageOrderSearchByStateQO request);
 
-    List<DeliverStructuralPackageOrderExtendVO> searchByStateAll(DeliverStructuralPackageOrderSearchByStateQO request);
+    List<DeliverStructuralPackageOrderExtendVO> searchByStateAll(StructuralPackageOrderSearchByStateQO request);
 
     List<DeliverStructuralPackageOrderExtendVO> getListByIds(List<Long> ids);
 
@@ -39,4 +39,6 @@ public interface IWmsStructuralPackageOrderTrayService extends IService<WmsStruc
     String getLast(String key);
 
     DeliverStructuralPackageOrderTrayVO getInfoByNo(@Valid @NotBlank String trayNo);
+
+    List<Long> getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderMapServiceImpl.java

@@ -0,0 +1,20 @@
+package com.nflg.wms.repository.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrderMap;
+import com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapMapper;
+import com.nflg.wms.repository.service.IWmsStructuralPackageDeliverOrderMapService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+@Service
+public class WmsStructuralPackageDeliverOrderMapServiceImpl extends ServiceImpl<WmsStructuralPackageDeliverOrderMapMapper, WmsStructuralPackageDeliverOrderMap> implements IWmsStructuralPackageDeliverOrderMapService {
+
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageDeliverOrderServiceImpl.java

@@ -0,0 +1,40 @@
+package com.nflg.wms.repository.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.wms.common.pojo.qo.StructuralPackageDeliverOrderSearchQO;
+import com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO;
+import com.nflg.wms.repository.entity.WmsStructuralPackageDeliverOrder;
+import com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper;
+import com.nflg.wms.repository.service.IWmsStructuralPackageDeliverOrderService;
+import com.nflg.wms.repository.service.IWmsStructuralPackageOrderService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 代码生成器生成
+ * @since 2025
+ */
+@Service
+public class WmsStructuralPackageDeliverOrderServiceImpl extends ServiceImpl<WmsStructuralPackageDeliverOrderMapper, WmsStructuralPackageDeliverOrder> implements IWmsStructuralPackageDeliverOrderService {
+
+    @Resource
+    private IWmsStructuralPackageOrderService wmsStructuralPackageOrderService;
+
+    @Override
+    public IPage<StructuralPackageDeliverOrderVO> search(StructuralPackageDeliverOrderSearchQO request) {
+        List<Long> externalOrderIds = null;
+        if (StrUtil.isNotBlank(request.getExternalOrderNo())){
+            externalOrderIds=baseMapper.getIdsByExternalOrderNo(request.getExternalOrderNo());
+        }
+        return baseMapper.search(request,externalOrderIds,new Page<>(request.getPage(),request.getPageSize()));
+    }
+}

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nflg.wms.common.constant.OrderState;
-import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchQO;
+import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchQO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderForPackageItemVO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO;
 import com.nflg.wms.common.util.UserUtil;
@@ -54,7 +54,7 @@ public class WmsStructuralPackageOrderServiceImpl extends ServiceImpl<WmsStructu
     }
 
     @Override
-    public IPage<DeliverStructuralPackageOrderVO> search(DeliverStructuralPackageOrderSearchQO request) {
+    public IPage<DeliverStructuralPackageOrderVO> search(StructuralPackageOrderSearchQO request) {
         return baseMapper.search(request,new Page<>(request.getPage(),request.getPageSize()));
     }
 

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsStructuralPackageOrderTrayServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nflg.wms.common.pojo.qo.DeliverStructuralPackageOrderSearchByStateQO;
+import com.nflg.wms.common.pojo.qo.StructuralPackageOrderSearchByStateQO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO;
 import com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderTrayVO;
 import com.nflg.wms.repository.entity.WmsStructuralPackageOrderTray;
@@ -41,12 +41,12 @@ public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl<WmsStr
     }
 
     @Override
-    public IPage<DeliverStructuralPackageOrderExtendVO> searchByState(DeliverStructuralPackageOrderSearchByStateQO request) {
+    public IPage<DeliverStructuralPackageOrderExtendVO> searchByState(StructuralPackageOrderSearchByStateQO request) {
         return baseMapper.searchByState(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 
     @Override
-    public List<DeliverStructuralPackageOrderExtendVO> searchByStateAll(DeliverStructuralPackageOrderSearchByStateQO request) {
+    public List<DeliverStructuralPackageOrderExtendVO> searchByStateAll(StructuralPackageOrderSearchByStateQO request) {
         return baseMapper.searchByState(request);
     }
 
@@ -69,4 +69,9 @@ public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl<WmsStr
     public DeliverStructuralPackageOrderTrayVO getInfoByNo(String trayNo) {
         return baseMapper.getInfoByNo(trayNo);
     }
+
+    @Override
+    public List<Long> getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo) {
+        return baseMapper.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo);
+    }
 }

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapMapper">
+
+</mapper>

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper">
+
+    <select id="search" resultType="com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO">
+        select pdo.*, us.supplier_code, us.supplier_name
+        from wms_structural_package_deliver_order pdo
+        inner join user_supplier us on pdo.id=us.user_id
+        <where>
+            <if test="externalOrderIds!=null">
+                and pdo.id in
+                <foreach item="item" collection="externalOrderIds" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="request.supplierId!=null">
+                and pdo.supplier_id=#{request.supplierId}
+            </if>
+            <if test="request.no!=null and request.no!=''">
+                and pdo.no like concat('%',#{request.no},'%')
+            </if>
+            <if test="request.startDate!=null">
+                and pdo.create_time >= #{request.startDate}
+            </if>
+            <if test="request.endDate!=null">
+                and pdo.create_time &lt;= #{request.endDate}
+            </if>
+        </where>
+    </select>
+
+    <select id="getIdsByExternalOrderNo" resultType="java.lang.Long">
+        select om.deliver_id
+        from wms_structural_package_order o
+        inner join wms_structural_package_deliver_order_map om on o.id=om.order_id
+        where o.external_order_no like concat('%',#{externalOrderNo},'%')
+    </select>
+</mapper>

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml

@@ -82,4 +82,11 @@
                  inner join wms_structural_package_order_tray ot on o.id=ot.order_id
         where ot.no=#{no}
     </select>
+
+    <select id="getIdsByMaterialAndExternalOrderNo" resultType="java.lang.Long">
+        select ot.id
+        from wms_structural_package_order o
+        inner join wms_structural_package_order_tray ot on o.id=ot.order_id
+        where o.external_order_no=#{externalOrderNo} and o.package_id=#{packageId}
+    </select>
 </mapper>

nflg-wms-repository/src/test/java/com/nflg/wms/repository/CodeGeneratorTest.java

@@ -33,7 +33,7 @@ public class CodeGeneratorTest {
                 )
                 .strategyConfig(builder -> {
                     builder
-                            .addInclude("wms_srm_order_item") //只生成指定表
+                            .addInclude("wms_structural_package_deliver_order_map") //只生成指定表
                             .entityBuilder().idType(IdType.ASSIGN_ID)
                             .enableLombok()
                             .enableChainModel()