Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java

@@ -128,5 +128,8 @@ public class WmsMaterialCoil extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = "发货时间")
     private Date exportTime;
+
+    //销售id
+    private Long saleId;
 }
 

klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java

@@ -183,5 +183,7 @@ public class WmsMaterialCoilBo extends BaseEntity {
 
     private Boolean onlyUnshippedAndUnplanned;
 
+    //销售id
+    private Long saleId;
 }
 

klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java

@@ -310,5 +310,9 @@ public class WmsMaterialCoilVo extends BaseEntity {
     private String createByName;
     private String updateByName;
 
+    //销售id
+    private Long saleId;
+    // 销售昵称
+    private String saleName;
 }
 

klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java

@@ -337,6 +337,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus());
         qw.eq(bo.getActualWarehouseId() != null, "mc.actual_warehouse_id", bo.getActualWarehouseId());
         qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
+        // 新增查询逻辑也就是当saleId未空时候
+        if (bo.getSaleId() != null) {
+            if (bo.getSaleId() == -1) {
+                // 当saleId为-1时查询sale_id为空的记录
+                qw.isNull("mc.sale_id");
+            } else if (bo.getSaleId() > 0) {
+                // 正常传值时依据saleId作为查询条件
+                qw.eq("mc.sale_id", bo.getSaleId());
+            }
+        }
 
         // 组合 item_id 条件：selectType 细粒度筛选 与 显式 itemIds/itemId 的并行支持
         List<Long> matchedItemIds = null; // 来自 selectType + 多字段筛选

klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml

@@ -94,7 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mc.trimming_requirement,
             mc.packaging_requirement,
             mc.packing_status,
+            mc.sale_id AS saleId,
             w.warehouse_name AS warehouseName,
+            su.nick_name AS saleName,
             aw.actual_warehouse_name AS actualWarehouseName,
             CASE WHEN mc.item_type = 'raw_material' THEN rm.specification
                  WHEN mc.item_type = 'product' THEN p.specification
@@ -127,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM wms_material_coil mc
         LEFT JOIN wms_warehouse w ON mc.warehouse_id = w.warehouse_id
         LEFT JOIN wms_actual_warehouse aw ON mc.actual_warehouse_id = aw.actual_warehouse_id
+        LEFT JOIN sys_user su　ON mc.sale_id = su.user_id
         LEFT JOIN wms_raw_material rm ON mc.item_type = 'raw_material' AND mc.item_id = rm.raw_material_id
         LEFT JOIN wms_product p ON mc.item_type = 'product' AND mc.item_id = p.product_id
         LEFT JOIN (