库存列表 导入导出

库存记录
更新供应商 最后一次进货时间

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/OutAndOnDto.java

@@ -1,8 +1,6 @@
 package cn.ysk.cashier.dto.product;
 
-import lombok.Data;
 import lombok.NonNull;
-
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -54,6 +52,8 @@ public class OutAndOnDto {
     @NonNull
     private String shopId;
 
+    private String isImport;
+
 
     public String getBatchNumber() {
         return batchNumber;
@@ -142,4 +142,12 @@ public class OutAndOnDto {
     public void setShopId(String shopId) {
         this.shopId = shopId;
     }
+
+    public String getIsImport() {
+        return isImport;
+    }
+
+    public void setIsImport(String isImport) {
+        this.isImport = isImport;
+    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockImportDto.java

@@ -0,0 +1,10 @@
+package cn.ysk.cashier.dto.product;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+@Data
+public class StockImportDto {
+    private String shopId;
+    private MultipartFile file;
+
+}

eladmin-system/src/main/java/cn/ysk/cashier/dto/product/StockQueryDto.java

@@ -0,0 +1,30 @@
+package cn.ysk.cashier.dto.product;
+
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+@Data
+public class StockQueryDto {
+
+    private String name;
+    private String shopId;
+    private Integer isStock;
+
+    public void setName(String name) {
+        if (StringUtils.isNotBlank(name)) {
+            this.name = name;
+        }
+    }
+
+    public void setShopId(String shopId) {
+        if (StringUtils.isNotBlank(shopId) && !shopId.equals("1")) {
+            this.shopId = shopId;
+        }
+    }
+
+    public void setIsStock(Integer isStock) {
+        if (isStock!=null) {
+            this.isStock = isStock;
+        }
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopPurveyorTransactQueryCriteria.java

@@ -55,4 +55,10 @@ public class TbShopPurveyorTransactQueryCriteria{
     private Integer size;
 
     private String sort;
+
+    public void setStatus(Integer status) {
+        if (status != null) {
+            this.status = status;
+        }
+    }
 }