diff --git a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java
index 5d55af22..74390fc3 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsDeliveryWaybillController.java
@@ -85,6 +85,12 @@ public class WmsDeliveryWaybillController extends BaseController {
         return toAjax(iWmsDeliveryWaybillService.updateByBo(bo));
     }
 
+    // 修改发货单状态
+    @Log(title = "发货单主", businessType = BusinessType.UPDATE)
+    @PutMapping("/status")
+    public R<Void> changeStatus(@RequestBody WmsDeliveryWaybillBo bo) {
+        return toAjax(iWmsDeliveryWaybillService.changeStatus(bo));
+    }
     /**
      * 删除发货单主
      *
diff --git a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java
index 4910dc68..3c2dad6b 100644
--- a/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java
+++ b/klp-wms/src/main/java/com/klp/service/IWmsDeliveryWaybillService.java
@@ -46,4 +46,6 @@ public interface IWmsDeliveryWaybillService {
      * 校验并批量删除发货单主信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Boolean changeStatus(WmsDeliveryWaybillBo bo);
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
index 2d43195e..2f627233 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
@@ -105,7 +105,13 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
-
+    @Override
+    public Boolean changeStatus(WmsDeliveryWaybillBo bo) {
+        WmsDeliveryWaybill update = new WmsDeliveryWaybill();
+        update.setWaybillId(bo.getWaybillId());
+        update.setStatus(bo.getStatus());
+        return baseMapper.updateById(update) > 0;
+    }
     /**
      * 保存前的数据校验
      */
@@ -123,4 +129,6 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 7c5445fd..fb7b7a69 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -394,6 +394,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade());
         // 独占状态
         qw.eq(bo.getExclusiveStatus() != null, "mc.exclusive_status", bo.getExclusiveStatus());
+        //逻辑删除
+        qw.eq("mc.del_flag", 0);
         // 按创建时间范围筛选
         if (bo.getByCreateTimeStart() != null) {
             qw.ge("mc.create_time", bo.getByCreateTimeStart());
@@ -401,13 +403,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (bo.getByCreateTimeEnd() != null) {
             qw.le("mc.create_time", bo.getByCreateTimeEnd());
         }
-        // 按发货时间范围筛选
-        if (bo.getByExportTimeStart() != null) {
-            qw.ge("mc.export_time", bo.getByExportTimeStart());
-        }
-        if (bo.getByExportTimeEnd() != null) {
-            qw.le("mc.export_time", bo.getByExportTimeEnd());
-        }
         // 统一处理 warehouseId 与 warehouseIds：
         List<Long> warehouseIdList = new ArrayList<>();
         if (bo.getWarehouseId() != null) {
@@ -576,17 +571,13 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 //                "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " +
 //                "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
 //        }
-        //逻辑删除
-        qw.eq("mc.del_flag", 0);
+
         //把team字段作为筛选条件
         qw.eq(StringUtils.isNotBlank(bo.getTeam()), "mc.team", bo.getTeam());
         //根据开始时间和结束时间筛选修改时间
         qw.ge(bo.getStartTime() != null, "mc.update_time", bo.getStartTime());
         qw.le(bo.getEndTime() != null, "mc.update_time", bo.getEndTime());
 
-        qw.ge(bo.getByCreateTimeStart() != null, "mc.create_time", bo.getByCreateTimeStart());
-        qw.le(bo.getByCreateTimeEnd() != null, "mc.create_time", bo.getByCreateTimeEnd());
-
         // 处理发货时间筛选逻辑（核心修改部分）
         if (bo.getByExportTimeStart() != null || bo.getByExportTimeEnd() != null) {
             // 开启OR条件分组：满足情况1 或 情况2