成品库出入库单号

sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventoryFinishedOrderSelectDto.java

@@ -49,4 +49,9 @@ public class InventoryFinishedOrderSelectDto extends BaseSelectDto {
      */
     private Long departmentId;
 
+    /**
+     * 出入库单号
+     */
+    private String code;
+
 }

sd-business/src/main/java/com/sd/business/entity/inventory/po/InventoryFinishedOrder.java

@@ -44,7 +44,7 @@ public class InventoryFinishedOrder extends BasePo {
     /**
      * 数量
      */
-    @ExcelProperty(value = "数量", index = 2)
+    @ExcelProperty(value = "数量", index = 3)
     private BigDecimal quantity;
 
     /**

sd-business/src/main/java/com/sd/business/entity/inventory/vo/InventoryFinishedOrderVo.java

@@ -22,31 +22,31 @@ public class InventoryFinishedOrderVo extends InventoryFinishedOrder {
     /**
      * sku规格品号
      */
-    @ExcelProperty(value = "sku品号", index = 0)
+    @ExcelProperty(value = "sku品号", index = 1)
     private String skuSpecCode;
 
     /**
      * sku规格品名
      */
-    @ExcelProperty(value = "sku品名", index = 1)
+    @ExcelProperty(value = "sku品名", index = 2)
     private String skuSpecName;
 
     /**
      * 订单号
      */
-    @ExcelProperty(value = "订单号", index = 3)
+    @ExcelProperty(value = "订单号", index = 4)
     private String orderCode;
 
     /**
      * 万里牛订单号
      */
-    @ExcelProperty(value = "万里牛单号", index = 4)
+    @ExcelProperty(value = "万里牛单号", index = 5)
     private String orderWlnCode;
 
     /**
      * 事业部名称
      */
-    @ExcelProperty(value = "事业部", index = 5)
+    @ExcelProperty(value = "事业部", index = 6)
     private String departmentName;
 
     /**
@@ -57,14 +57,20 @@ public class InventoryFinishedOrderVo extends InventoryFinishedOrder {
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "时间", index = 6)
+    @ExcelProperty(value = "时间", index = 7)
     private Date createTime;
 
 
     /**
      * 操作类型
      */
-    @ExcelProperty(value = "状态", index = 7)
+    @ExcelProperty(value = "状态", index = 8)
     private String operationTypeStr;
 
+    /**
+     * 单号
+     */
+    @ExcelProperty(value = "出入库单号", index = 0)
+    private String code;
+
 }

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryFinishedOrderServiceImpl.java

@@ -102,7 +102,8 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
     @Override
     public Page<InventoryFinishedOrderVo> getPage(InventoryFinishedOrderSelectDto dto) {
         IWrapper<InventoryFinishedOrder> wrapper = getWrapper();
-        wrapper.orderByDesc("ifod", InventoryFinishedOrder::getId);
+        wrapper.orderByDesc("ifod", InventoryFinishedOrderDetail::getId);
+        wrapper.like("ifod", InventoryFinishedOrderDetail::getCode, dto.getCode());
         wrapper.eq("ss", SkuSpec::getId, dto.getSkuSpecId());
         wrapper.like("ss", SkuSpec::getCode, dto.getSkuSpecCode());
         wrapper.like("ss", SkuSpec::getName, dto.getSkuSpecName());

sd-business/src/main/resources/mapper/inventory/InventoryFinishedOrderMapper.xml

@@ -10,7 +10,8 @@
                oi.wln_code         orderWlnCode,
                d.name              departmentName,
                ifod.create_time,
-               ifod.operation_type operationType
+               ifod.operation_type operationType,
+               ifod.code
         from inventory_finished_order_detail ifod
                  inner join order_info oi on ifod.order_info_id = oi.id
                  inner join department d on ifod.department_id = d.id