楚江ERP-发货单批量打印接口开发

@@ -167,7 +167,7 @@ public class OrderChangeRecordController extends DefaultBaseController {
         try (InputStream inputStream = templateResource.getStream();
                 Workbook workbook = new XSSFWorkbook(inputStream)) {
             // 设置响应头
-            ResponseUtil.setResponseHead(response, data.getOrderNo() + "-订货单变更记录.xlsx");
+            ResponseUtil.setExcelResponseHead(response, data.getOrderNo() + "-订货单变更记录.xlsx");
 
             Sheet sheet = workbook.getSheetAt(0);
             // 规格变更开始行

 package com.lframework.xingyun.sc.controller.shipments;
 
+import cn.hutool.core.io.resource.ClassPathResource;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.plan.ShipmentsPlanDetailBo;
 import com.lframework.xingyun.sc.entity.ShipmentsPlanDetail;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.utils.ExcelUtil;
+import com.lframework.xingyun.sc.utils.LatexFormulaExcelExporterUtil;
+import com.lframework.xingyun.sc.utils.ResponseUtil;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
@@ -13,6 +20,7 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import io.swagger.annotations.ApiImplicitParam;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
@@ -20,6 +28,12 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
@@ -27,8 +41,19 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.io.*;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 发货单 Controller
@@ -36,6 +61,7 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "发货单")
 @Validated
+@Slf4j
 @RestController
 @RequestMapping("/shipments/order")
 public class ShipmentsOrderInfoController extends DefaultBaseController {
@@ -45,6 +71,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     private ShipmentsOrderInfoService shipmentsOrderInfoService;
     @Resource
     private ShipmentsPlanDetailService shipmentsPlanDetailService;
+    @Resource
+    private SysUserService sysUserService;
 
 
     /**
@@ -164,4 +192,252 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
         shipmentsOrderInfoService.saveSignInTicket(vo);
         return InvokeResultBuilder.success();
     }
+
+
+    /**
+     * 发货单批量打印
+     * @param vo            打印参数
+     * @param response      响应体
+     */
+    @ApiOperation("发货单批量打印")
+    @GetMapping("/batchPrintShipmentsOrder")
+    public void batchPrintShipmentsOrder(@Valid ExportShipmentsOrderVo vo, HttpServletResponse response) {
+        List<ShipmentsOrderInfo> orderInfoList = shipmentsOrderInfoService.listByIds(vo.getIds());
+        if (CollectionUtils.isEmpty(orderInfoList)) {
+            throw new DefaultClientException("发货单不存在！");
+        }
+        // 加载模板文件
+        String templatePath = "templates/shipmentsOrderTemplate_02.xlsx";
+        if ("TYPE_1".equals(vo.getType())) {
+            templatePath = "templates/shipmentsOrderTemplate_01.xlsx";
+        }
+        // 创建临时目录
+        Path tempDir = null;
+        File zipFile = null;
+        try {
+            // 设置响应头
+            ResponseUtil.setZipResponseHead(response, "发货单.zip");
+            // 创建临时目录存放Excel文件
+            tempDir = Files.createTempDirectory("/tmp/shipments_order_export");
+
+            List<String> shipmentsOrderIds = new ArrayList<>();
+            for (ShipmentsOrderInfo orderInfo : orderInfoList) {
+                String id = orderInfo.getId();
+                shipmentsOrderIds.add(id);
+            }
+            List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentsOrderIds);
+            if (CollectionUtils.isEmpty(detailList)) {
+                throw new DefaultClientException("发货单明细不存在！");
+            }
+            // 按发货单ID分组明细数据
+            Map<String, List<ShipmentsPlanDetail>> shipmentsOrderDetailMap = detailList.stream()
+                    .collect(Collectors.groupingBy(ShipmentsPlanDetail::getShipmentOrderId));
+            // 为每个发货单生成Excel文件
+            List<File> excelFiles = new ArrayList<>();
+            for (ShipmentsOrderInfo orderInfo : orderInfoList) {
+                String id = orderInfo.getId();
+                List<ShipmentsPlanDetail> details = shipmentsOrderDetailMap.get(id);
+                if (CollectionUtils.isEmpty(details)) {
+                    throw new DefaultClientException("发货单明细不存在！");
+                }
+                // 生成单个Excel文件（使用模板引擎）
+                File excelFile = generateExcelWithTemplate(orderInfo, details, templatePath, tempDir, vo.getType());
+                if (excelFile != null) {
+                    excelFiles.add(excelFile);
+                }
+            }
+            // 创建ZIP压缩包
+            createZipFile(excelFiles, "发货单批量导出_" + System.currentTimeMillis() + ".zip");
+        } catch (FileNotFoundException e) {
+            log.error("发货单批量打印失败: ", e);
+            throw new DefaultClientException("模板文件不存在: " + templatePath);
+        } catch (IOException e) {
+            log.error("发货单批量打印失败: ", e);
+            throw new DefaultClientException("无法读取模板文件: " + templatePath);
+        } catch (Exception e) {
+            log.error("发货单批量打印失败: ", e);
+            throw new DefaultClientException(e.getMessage());
+        } finally {
+            // 清理临时文件
+            cleanupTempFiles(tempDir, zipFile);
+        }
+    }
+
+
+    /**
+     * 生成excel文件
+     *
+     * @param orderInfo     发货单
+     * @param detailList    发货单明细
+     * @param templatePath  模板文件路径
+     * @param tempDir       临时目录
+     * @return              File
+     * @throws IOException  抛出异常
+     */
+    private File generateExcelWithTemplate(ShipmentsOrderInfo orderInfo, List<ShipmentsPlanDetail> detailList, String templatePath, Path tempDir
+            , String type) throws IOException {
+        ClassPathResource templateResource = new ClassPathResource(templatePath);
+        try (InputStream inputStream = templateResource.getStream();
+             Workbook workbook = new XSSFWorkbook(inputStream)) {
+            Sheet sheet = workbook.getSheetAt(0);
+            // 发货单明细开始行
+            int startRow = 4;
+            DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            for (int i = startRow + 1; i < startRow + detailList.size(); i++) {
+                ExcelUtil.copyRow(workbook, sheet, startRow, i);
+            }
+            BigDecimal totalQuantity = BigDecimal.ZERO;
+            BigDecimal totalActualQuantity = BigDecimal.ZERO;
+            BigDecimal totalNum = BigDecimal.ZERO;
+            BigDecimal totalPrice = BigDecimal.ZERO;
+            for (ShipmentsPlanDetail detail : detailList) {
+                BigDecimal quantity = detail.getQuantity() == null ? BigDecimal.ZERO : detail.getQuantity();
+                BigDecimal actualQuantity = detail.getActualShipmentQuantity() == null ? BigDecimal.ZERO : new BigDecimal(detail.getActualShipmentQuantity());
+                BigDecimal num = detail.getNum() == null ? BigDecimal.ZERO : new BigDecimal(detail.getNum());
+
+                totalQuantity = totalQuantity.add(quantity);
+                totalActualQuantity = totalActualQuantity.add(actualQuantity);
+                totalNum = totalNum.add(num);
+                // 计算总金额
+                if (detail.getSalesPrice() != null) {
+                    BigDecimal result = actualQuantity.multiply(detail.getSalesPrice());
+                    totalPrice = totalPrice.add(result);
+                }
+            }
+            for (ShipmentsPlanDetail detail : detailList) {
+                ExcelUtil.setCellValue(sheet, startRow, 0, detail.getOrderNo());
+                ExcelUtil.setCellValue(sheet, startRow, 1, detail.getBrand());
+                // 处理规格数据
+                List<LatexFormulaExcelExporterUtil.FormulaComponent> formulaComponentList = new ArrayList<>(3);
+                if (detail.getThickness() != null) {
+                    LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                    formulaComponent.setBase(detail.getThickness());
+                    formulaComponent.setSup(detail.getThicknessTolPos());
+                    formulaComponent.setSub(detail.getThicknessTolNeg());
+                    formulaComponentList.add(formulaComponent);
+                }
+                if (detail.getWidth() != null) {
+                    LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                    formulaComponent.setBase(detail.getWidth());
+                    formulaComponent.setSup(detail.getWidthTolPos());
+                    formulaComponent.setSub(detail.getWidthTolNeg());
+                    formulaComponentList.add(formulaComponent);
+                }
+                if (detail.getLength() != null) {
+                    LatexFormulaExcelExporterUtil.FormulaComponent formulaComponent = new LatexFormulaExcelExporterUtil.FormulaComponent();
+                    formulaComponent.setBase(detail.getLength());
+                    formulaComponent.setSup(detail.getLengthTolPos());
+                    formulaComponent.setSub(detail.getLengthTolNeg());
+                    formulaComponentList.add(formulaComponent);
+                }
+                String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                if (StringUtils.isNotBlank(latex)) {
+                    LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7);
+                }
+                // 处理订单类型
+                String orderType = handleContractType(detail.getContractType());
+
+                ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity());
+                if ("TYPE_2".equals(type)) {
+                    ExcelUtil.setCellValue(sheet, startRow, 10, detail.getActualShipmentQuantity());
+                    ExcelUtil.setCellValue(sheet, startRow, 11, detail.getNum());
+                    ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice());
+                    ExcelUtil.setCellValue(sheet, startRow, 13, orderType);
+                    ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo());
+                } else {
+                    ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee());
+                    ExcelUtil.setCellValue(sheet, startRow, 15, orderType);
+                }
+                startRow++;
+            }
+            // 准备模板数据
+            Map<String, Object> dataMap = JsonUtil.parseMap(JsonUtil.toJsonString(orderInfo), String.class, Object.class);
+            dataMap.put("createDate", dateFormatter.format(orderInfo.getCreateTime()));
+            SysUser user = sysUserService.findById(orderInfo.getCreateById());
+            dataMap.put("createBy", user.getName());
+            dataMap.put("totalQuantity", totalQuantity.setScale(2, RoundingMode.HALF_UP));
+            dataMap.put("totalActualQuantity", totalActualQuantity.setScale(2, RoundingMode.HALF_UP));
+            dataMap.put("totalNum", totalNum.setScale(2, RoundingMode.HALF_UP));
+            dataMap.put("totalPrice", totalPrice.setScale(2, RoundingMode.HALF_UP));
+            // 流水号
+            String serialNumber = "";
+            // 处理模板中的占位符
+            ExcelUtil.processTemplate(workbook, dataMap);
+            // 生成文件名
+            String fileName = String.format("发货单_%s.xlsx", serialNumber);
+            File excelFile = new File(tempDir.toFile(), fileName);
+            // 保存Excel文件
+            try (FileOutputStream fos = new FileOutputStream(excelFile)) {
+                workbook.write(fos);
+            }
+            return excelFile;
+        } catch (IOException e) {
+            log.error("生成发货单Excel失败, 发货单ID: {}", orderInfo.getId(), e);
+            return null;
+        }
+    }
+
+    /**
+     * 处理订单类型
+     *
+     * @param contractType  合同类型
+     * @return              String
+     */
+    private String handleContractType(String contractType) {
+        String result = "";
+        if ("DISTRIB_STD".equals(contractType) || "DIST_STOCK_CONTRACT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType)) {
+            result = "经销";
+        } else if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)
+                || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            result = "外贸";
+        } else if ("PROCESS_STD_AGMT".equals(contractType)) {
+            result = "加工";
+        }
+        return result;
+    }
+
+
+    /**
+     * 创建ZIP压缩包
+     */
+    private void createZipFile(List<File> excelFiles, String zipFileName) throws IOException {
+        File zipFile = File.createTempFile("/tmp/shipments_order_export", ".zip");
+        try (FileOutputStream fos = new FileOutputStream(zipFile);
+             ZipOutputStream zos = new ZipOutputStream(fos)) {
+            byte[] buffer = new byte[1024];
+            for (File excelFile : excelFiles) {
+                try (FileInputStream fis = new FileInputStream(excelFile)) {
+                    ZipEntry zipEntry = new ZipEntry(excelFile.getName());
+                    zos.putNextEntry(zipEntry);
+                    int length;
+                    while ((length = fis.read(buffer)) > 0) {
+                        zos.write(buffer, 0, length);
+                    }
+                    zos.closeEntry();
+                }
+            }
+        }
+    }
+
+    /**
+     * 清理临时文件
+     */
+    private void cleanupTempFiles(Path tempDir, File zipFile) {
+        try {
+            // 删除临时目录
+            if (tempDir != null && Files.exists(tempDir)) {
+                Files.walk(tempDir)
+                        .sorted(Comparator.reverseOrder())
+                        .map(Path::toFile)
+                        .forEach(File::delete);
+            }
+            // 清理
+             if (zipFile != null && zipFile.exists()) {
+                 zipFile.delete();
+             }
+        } catch (IOException e) {
+            log.warn("清理临时文件失败", e);
+        }
+    }
 }

@@ -386,29 +386,29 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
         if ("一分厂".equals(workshopName)) {
             // 经营办主管
             roleCodeList.add("yfcjybzg");
-            // 生产经理
-            roleCodeList.add("yfcscjl");
+            // 生产分管
+            roleCodeList.add("yfcscfg");
             // 品质经理
             roleCodeList.add("yfcpzjl");
         } else if ("二分厂".equals(workshopName)) {
             // 经营办主管
             roleCodeList.add("efcjybzg");
-            // 生产经理
-            roleCodeList.add("efcscjl");
+            // 生产分管
+            roleCodeList.add("efcscfg");
             // 品质经理
             roleCodeList.add("efcpzjl");
         } else if ("三分厂".equals(workshopName)) {
             // 经营办主管
             roleCodeList.add("sfcjybzg");
-            // 生产经理
-            roleCodeList.add("sfcscjl");
+            // 生产分管
+            roleCodeList.add("sfcscfg");
             // 品质经理
             roleCodeList.add("sfcpzjl");
         } else if ("四分厂".equals(workshopName) || "紫铜厂".equals(workshopName)) {
             // 经营办主管
             roleCodeList.add("ztcjybzg");
-            // 生产经理
-            roleCodeList.add("ztcscjl");
+            // 生产分管
+            roleCodeList.add("ztcscfg");
             // 品质经理
             roleCodeList.add("ztcpzjl");
         }

 package com.lframework.xingyun.sc.impl.shipments;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
@@ -84,6 +85,17 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
 
     @Override
     public List<ShipmentsOrderInfo> query(QueryShipmentsOrderInfoVo vo) {
+        if (StringUtils.isNotBlank(vo.getDeptName())) {
+            // 办事处模糊查询处理
+            LambdaQueryWrapper<SysDept> queryWrapper = Wrappers.lambdaQuery(SysDept.class);
+            queryWrapper.like(SysDept::getName, vo.getDeptName());
+            List<SysDept> deptList = sysDeptService.getBaseMapper().selectList(queryWrapper);
+            if (CollectionUtils.isEmpty(deptList)) {
+                return Collections.emptyList();
+            }
+            List<String> deptIds = deptList.stream().map(SysDept::getId).collect(Collectors.toList());
+            vo.setDeptIds(deptIds);
+        }
         List<ShipmentsOrderInfo> shipmentsOrderList = getBaseMapper().query(vo);
         if (CollectionUtils.isEmpty(shipmentsOrderList)) {
             return Collections.emptyList();

@@ -297,7 +297,15 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         if (StringUtils.isBlank(shipmentOrderId)) {
             return Collections.emptyList();
         }
-        return getBaseMapper().listByShipmentOrderId(shipmentOrderId);
+        return getBaseMapper().listByShipmentOrderId(Collections.singletonList(shipmentOrderId));
+    }
+
+    @Override
+    public List<ShipmentsPlanDetail> listByShipmentOrderId(List<String> shipmentOrderIds) {
+        if (CollectionUtils.isEmpty(shipmentOrderIds)) {
+            return Collections.emptyList();
+        }
+        return getBaseMapper().listByShipmentOrderId(shipmentOrderIds);
     }
 
     @Override

@@ -43,10 +43,10 @@ public interface ShipmentsPlanDetailMapper extends BaseMapper<ShipmentsPlanDetai
     /**
      * 根据发货单ID查询
      *
-     * @param shipmentOrderId   发货单ID
+     * @param shipmentOrderIds  发货单ID集合
      * @return                  List<ShipmentsPlanDetail>
      */
-    List<ShipmentsPlanDetail> listByShipmentOrderId(String shipmentOrderId);
+    List<ShipmentsPlanDetail> listByShipmentOrderId(@Param("shipmentOrderIds") List<String> shipmentOrderIds);
 
     /**
      * 根据计划ID查询

@@ -88,6 +88,7 @@ public interface ShipmentsPlanDetailService extends BaseMpService<ShipmentsPlanD
      * @return                  List<ShipmentsPlanDetail>
      */
     List<ShipmentsPlanDetail> listByShipmentOrderId(String shipmentOrderId);
+    List<ShipmentsPlanDetail> listByShipmentOrderId(List<String> shipmentOrderIds);
 
     /**
      * 批量设置发货单ID

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
+import org.springframework.http.HttpHeaders;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.swing.*;
@@ -15,8 +16,9 @@ public class ResponseUtil {
 
     /**
      * 设置HTTP响应头
+     * excel
      */
-    public static void setResponseHead(HttpServletResponse response, String fileName)  throws IOException {
+    public static void setExcelResponseHead(HttpServletResponse response, String fileName)  throws IOException {
         String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
 
         response.setContentType("application/vnd.ms-excel");
@@ -26,4 +28,18 @@ public class ResponseUtil {
     }
 
 
+    /**
+     * 设置HTTP响应头
+     * zip
+     */
+    public static void setZipResponseHead(HttpServletResponse response, String fileName)  throws IOException {
+        String encodedFileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+
+        response.setContentType("application/zip");
+        response.setCharacterEncoding("UTF-8");
+        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + encodedFileName + "\"");
+        response.setHeader(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate");
+    }
+
+
 }

+package com.lframework.xingyun.sc.vo.shipments.order;
+
+import com.lframework.starter.web.core.vo.BaseVo;
+import com.lframework.starter.web.core.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ExportShipmentsOrderVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID集合
+     */
+    @ApiModelProperty("ID集合")
+    @NotEmpty(message = "id不能为空！")
+    private List<String> ids;
+
+    /**
+     * 类型
+     * TYPE_1：记账联
+     * TYPE_2：客户联
+     */
+    @ApiModelProperty("类型")
+    @NotBlank(message = "打印类型不能为空！")
+    private String type;
+}

@@ -7,6 +7,7 @@ import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Serializable {
@@ -38,6 +39,7 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
      */
     @ApiModelProperty("办事处ID")
     private String deptId;
+    private List<String> deptIds;
 
     /**
      * 办事处名称

@@ -54,8 +54,12 @@
             <if test="vo.shipmentsDateEnd != null">
                 AND tb.shipments_date &lt;= #{vo.shipmentsDateEnd}
             </if>
-            <if test="vo.deptId != null and vo.deptId != ''">
-                AND tb.dept_id = #{vo.deptId}
+            <if test="vo.deptIds != null and vo.deptIds.size() > 0">
+                AND (
+                <foreach collection="vo.deptIds" item="deptId" separator=" OR ">
+                    FIND_IN_SET(#{deptId}, tb.dept_id) > 0
+                </foreach>
+                )
             </if>
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}

@@ -212,7 +212,10 @@
         LEFT JOIN base_data_customer c ON o.ordering_unit = c.id
         LEFT JOIN tbl_purchase_order_line ol ON tb.order_spec_id = ol.id
         WHERE tb.del_flag = false
-        AND tb.shipment_order_id = #{shipmentOrderId}
+        AND tb.shipment_order_id in
+        <foreach collection="shipmentOrderIds" open="(" separator="," close=")" item="item">
+            #{item}
+        </foreach>
     </select>
 
     <select id="listByPlanId" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">