diff --git a/warehousing-system/project/pom.xml b/warehousing-system/project/pom.xml
index 026c47da..63161ce5 100644
--- a/warehousing-system/project/pom.xml
+++ b/warehousing-system/project/pom.xml
@@ -7,7 +7,6 @@
wh
1.0-SNAPSHOT
- wh-common
wh-manage
diff --git a/warehousing-system/project/wh-manage/pom.xml b/warehousing-system/project/wh-manage/pom.xml
index 23857a1f..9c14adc7 100644
--- a/warehousing-system/project/wh-manage/pom.xml
+++ b/warehousing-system/project/wh-manage/pom.xml
@@ -13,11 +13,6 @@
-
- com.wh
- wh-common
- 1.0-SNAPSHOT
-
org.jetbrains
annotations
@@ -42,11 +37,6 @@
-
- com.yxt
- yxt-common-base
- 0.0.1
-
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/api/Api.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/api/Api.java
new file mode 100644
index 00000000..4a97e9b2
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/api/Api.java
@@ -0,0 +1,13 @@
+package com.wh.api;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class Api {
+
+ public String getTime(){
+ Date dNow = new Date( );
+ SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
+ return ft.format(dNow);
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/BasePojo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/BasePojo.java
new file mode 100644
index 00000000..2b276546
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/BasePojo.java
@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//pojo基类,完成2个任务,2个日期,实现序列化
+@Data
+@Accessors(chain=true)
+public class BasePojo implements Serializable{
+ @TableField(fill = FieldFill.INSERT)
+ private Date created; //表示入库时需要赋值
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updated; //表示入库/更新时赋值.
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/InStorehouse.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/InStorehouse.java
new file mode 100644
index 00000000..674a68bd
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/InStorehouse.java
@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("in_storehouse")
+public class InStorehouse {
+ @TableId("in_storehouse_id")
+ private String inStorehouseId; //入库单号
+ private String receivingId; //接货单号
+ private String locationId; //货位编码
+ private String createPerson; //创建者
+ private String createTime; //创建时间
+ private String checkPerson; //审批人id
+ private String checkTime; //审批时间
+ private String status; //状态
+ private String remarks; //备注
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Location.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Location.java
new file mode 100644
index 00000000..211c7a83
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Location.java
@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("location")
+public class Location {
+
+ private String name; //货位名称
+ @TableId(type = IdType.AUTO)
+ private int id;
+ private String locationId; //货位编号
+ private String type; //货位类型
+ private String status; //货位状态
+ private String storehouse; //所属仓库
+ private String storehouseid;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationQuery.java
new file mode 100644
index 00000000..5ef70177
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationQuery.java
@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class LocationQuery implements Query {
+
+ private String name; //货位名称
+ @TableId(type = IdType.AUTO)
+ private int id;
+ private String locationId; //货位编号
+ private String type; //货位类型
+ private String status; //货位状态
+ private String storehouse; //所属仓库
+ private String storehouseid;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationType.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationType.java
new file mode 100644
index 00000000..17daf0c7
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationType.java
@@ -0,0 +1,13 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("location_type")
+public class LocationType {
+ private Integer id; //类型序号
+ private String type; //类型
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationVo.java
new file mode 100644
index 00000000..070c64a1
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/LocationVo.java
@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class LocationVo {
+
+ private String name; //货位名称
+ private String locationId; //货位编号
+ private String type; //货位类型
+ private String status; //货位状态
+ private String storehouse; //所属仓库
+ private String storehouseid;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/OnShelves.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/OnShelves.java
new file mode 100644
index 00000000..f9538819
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/OnShelves.java
@@ -0,0 +1,29 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("on_shelves")
+@ToString
+public class OnShelves {
+ @TableId("shelves_id")
+ private String shelvesId; //上架单号
+ private String barCode; //商品编码
+ private String productName; //商品名称
+ private String locationId; //货位编号
+ private String locationName; //货位名称
+ private String fromLocationId; //源货位编号
+ private String fromLocationName; //源货位名称
+ private Integer count; //数量
+ private String status; //状态
+ private String createPerson; //创建人
+ private String createTime; //创建时间
+ private String checkPerson; //审核人
+ private String checkTime; //审核时间
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/OutStorehouse.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/OutStorehouse.java
new file mode 100644
index 00000000..6b179088
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/OutStorehouse.java
@@ -0,0 +1,29 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("out_storehouse")
+public class OutStorehouse {
+ @TableId("out_storehouse_id")
+ private String outStorehouseId; //出库单号
+ private String pickingId; //拣货单号
+ private String barCode; //商品条码
+ private String productName; //商品名
+ private Integer count; //数量
+ private String locationId; //货位id
+ private String status; //状态
+ private String receivePerson; //收件人
+ private String addr; //地址
+ private String outTime; //出库时间
+ private String createPerson; //创建人
+ private String createTime; //创建时间
+ private String checkPerson; //审核人
+ private String checkTime; //审核时间
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Picking.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Picking.java
new file mode 100644
index 00000000..05f875ce
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Picking.java
@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("picking")
+public class Picking {
+ @TableId("picking_id")
+ private String pickingId; //拣货单号
+ private String outStorehouseId; //出库单号
+ private String status; //状态
+ private String recipientPerson; //领取人
+ private String recipientTime; //领取时间
+ private String createPerson; //创建人
+ private String createTime; //创建时间
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Product.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Product.java
new file mode 100644
index 00000000..a34482af
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Product.java
@@ -0,0 +1,26 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@TableName("product")
+@Data
+@Accessors(chain = true)
+@ToString
+public class Product {
+ @TableId(type = IdType.AUTO)
+ private int id;
+ private String barCode; //条码
+ private String name; //商品名
+ private String anotherName; //别名
+ private Double value; //价值
+ private Double netWeight; //净重
+ private Double roughWeight; //毛重
+ private Integer effectiveDays; //有效天数
+ private String warehouse; //所属仓库
+ private String remarks; //备注
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/ProductQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/ProductQuery.java
new file mode 100644
index 00000000..c8816c5b
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/ProductQuery.java
@@ -0,0 +1,26 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString
+public class ProductQuery implements Query {
+ @TableId(type = IdType.AUTO)
+ private int id;
+ private String barCode; //条码
+ private String name; //商品名
+ private String anotherName; //别名
+ private Double value; //价值
+ private Double netWeight; //净重
+ private Double roughWeight; //毛重
+ private Integer effectiveDays; //有效天数
+ private String warehouse; //所属仓库
+ private String remarks; //备注
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Purchase.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Purchase.java
new file mode 100644
index 00000000..07a9969c
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Purchase.java
@@ -0,0 +1,25 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("purchase")
+@ToString
+public class Purchase {
+ @TableId("purchase_id")
+ private String purchaseId; //订单编号
+ private String product; //商品
+ private String barCode; //条码
+ private String supplier; //供应商名称
+ private Integer count; //数量
+ private String storehouse; //仓库名称
+ private String status; //状态
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Receiving.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Receiving.java
new file mode 100644
index 00000000..e8b8aada
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Receiving.java
@@ -0,0 +1,25 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("receiving")
+public class Receiving {
+ @TableId("receiving_id")
+ private String receivingId; //接货单编号
+ private String purchaseId; //采购单编号
+ private String removeId; //调拨编号
+ private String remarks; //备注
+ private String receivingPerson; //接货人id
+ private String receivingTime; //接货时间
+ private String checkPerson; //审批人id
+ private String checkTime; //审批时间
+ private String status; //状态
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Remove.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Remove.java
new file mode 100644
index 00000000..599a8fa9
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Remove.java
@@ -0,0 +1,28 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("remove")
+public class Remove {
+ @TableId
+ private String removeId; //序号
+ private String barCode; //商品编码
+ private String productName; //商品名称
+ private String locationId; //货位编号
+ private String fromLocationId; //源货位编号
+ private Integer count; //数量
+ private String status; //状态
+ private String createPerson; //创建人
+ private String createTime; //创建时间
+ private String checkPerson; //审核人
+ private String checkTime; //审核时间
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Rights.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Rights.java
new file mode 100644
index 00000000..0a3478d4
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Rights.java
@@ -0,0 +1,23 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.wh.pojo.BasePojo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@TableName("rights")
+@Data
+@Accessors(chain = true)
+public class Rights extends BasePojo {
+ private Integer id; //序号
+ private String name; //选项名
+ private Integer parentId; //父id
+ private String path; //url路径
+ private Integer level; //选项等级
+ @TableField(exist = false)
+ private List children; //不是表格固有属性
+}
+
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Stock.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Stock.java
new file mode 100644
index 00000000..ed4a20e6
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Stock.java
@@ -0,0 +1,20 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Stock {
+ private String inStorehouseId;
+ @TableId("location_id")
+ private String locationId;
+ private String locationName;
+ private String barCode;
+ private String productName;
+ private Integer totalQuantity;
+ private Integer availableQuantity;
+ private Integer lockedQuantity;
+ private String status;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Storehouse.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Storehouse.java
new file mode 100644
index 00000000..e175bb11
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Storehouse.java
@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("storehouse")
+public class Storehouse {
+ @TableId("id")
+ private int id;
+ private String name; //仓库名称
+ private String simpleName; //仓库简称
+ private String addr; //仓库地址
+ private String remarks; //备注
+ private String entSid;//企业sid
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Supplier.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Supplier.java
new file mode 100644
index 00000000..753d723e
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/Supplier.java
@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("supplier")
+public class Supplier {
+ @TableId(type = IdType.AUTO)
+ private int id;
+ private String name; //供应商名称
+ private String contacts; //联系人
+ private String number; //电话
+ private String remarks; //备注
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/SupplierQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/SupplierQuery.java
new file mode 100644
index 00000000..2d0daaa9
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/SupplierQuery.java
@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class SupplierQuery implements Query {
+ @TableId(type = IdType.AUTO)
+ private int id;
+ private String name; //供应商名称
+ private String contacts; //联系人
+ private String number; //电话
+ private String remarks; //备注
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/User.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/User.java
new file mode 100644
index 00000000..7ae572d3
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/User.java
@@ -0,0 +1,20 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("user")
+public class User {
+ @TableId("id")
+ private String id;
+ private String username;
+ private String password;
+ private String phone;
+ private String email;
+ private String status;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java
new file mode 100644
index 00000000..350e6b48
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java
@@ -0,0 +1,22 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InStoreHouseMainDetailVo implements Vo {
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorName; // varchar 50 审核人姓名
+ private String state; // varchar 50 审核状态
+ private String approvedDate; // varchar 50 审核日期
+ private List list;
+ private String purchaseSid;//采购申请单的sid
+ private String locationName; //货位名称
+ private String locationId;//货位id
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java
new file mode 100644
index 00000000..ab60f82b
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java
@@ -0,0 +1,165 @@
+package com.wh.pojo.api;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+public class InStoreHouseMainDto {
+ @NotBlank(message = "编号不能为空")
+ private String no; //varchar 50 编号
+ @NotBlank(message = "制单日期不能为空")
+ private String applicationDate; //date 50 制单日期
+ private String creatorSid; //varchar 64 制单人Sid
+ private String creatorName; /// varchar 50 制单人姓名
+ @NotBlank(message = "客户Sid不能为空")
+ private String custerSid; //varchar 64 客户Sid(企业)
+ @NotBlank(message = "客户名称不能为空")
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseSid; // varchar 64 仓库Sid
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorSid; //varchar 64 审核人Sid
+ private String auditorName; // varchar 50 审核人姓名
+ private String state; // varchar 50 审核状态
+ private String approvedDate; // varchar 50 审核日期
+ private String approvedRemark; // varchar 50
+ private List list;
+ private String purchaseSid;//采购申请单的sid
+ private String locationId;
+ private String locationName; //货位名称
+
+ public String getLocationName() {
+ return locationName;
+ }
+
+ public void setLocationName(String locationName) {
+ this.locationName = locationName;
+ }
+
+ public String getLocationId() {
+ return locationId;
+ }
+
+ public void setLocationId(String locationId) {
+ this.locationId = locationId;
+ }
+
+ public String getNo() {
+ return no;
+ }
+
+ public void setNo(String no) {
+ this.no = no;
+ }
+
+ public String getApplicationDate() {
+ return applicationDate;
+ }
+
+ public void setApplicationDate(String applicationDate) {
+ this.applicationDate = applicationDate;
+ }
+
+ public String getCreatorSid() {
+ return creatorSid;
+ }
+
+ public void setCreatorSid(String creatorSid) {
+ this.creatorSid = creatorSid;
+ }
+
+ public String getCreatorName() {
+ return creatorName;
+ }
+
+ public void setCreatorName(String creatorName) {
+ this.creatorName = creatorName;
+ }
+
+ public String getCusterSid() {
+ return custerSid;
+ }
+
+ public void setCusterSid(String custerSid) {
+ this.custerSid = custerSid;
+ }
+
+ public String getCusterName() {
+ return custerName;
+ }
+
+ public void setCusterName(String custerName) {
+ this.custerName = custerName;
+ }
+
+ public String getStoreHouseSid() {
+ return storeHouseSid;
+ }
+
+ public void setStoreHouseSid(String storeHouseSid) {
+ this.storeHouseSid = storeHouseSid;
+ }
+
+ public String getStoreHouseName() {
+ return storeHouseName;
+ }
+
+ public void setStoreHouseName(String storeHouseName) {
+ this.storeHouseName = storeHouseName;
+ }
+
+ public String getAuditorSid() {
+ return auditorSid;
+ }
+
+ public void setAuditorSid(String auditorSid) {
+ this.auditorSid = auditorSid;
+ }
+
+ public String getAuditorName() {
+ return auditorName;
+ }
+
+ public void setAuditorName(String auditorName) {
+ this.auditorName = auditorName;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getApprovedDate() {
+ return approvedDate;
+ }
+
+ public void setApprovedDate(String approvedDate) {
+ this.approvedDate = approvedDate;
+ }
+
+ public String getApprovedRemark() {
+ return approvedRemark;
+ }
+
+ public void setApprovedRemark(String approvedRemark) {
+ this.approvedRemark = approvedRemark;
+ }
+
+ public List getList() {
+ return list;
+ }
+
+ public void setList(List list) {
+ this.list = list;
+ }
+
+ public String getPurchaseSid() {
+ return purchaseSid;
+ }
+
+ public void setPurchaseSid(String purchaseSid) {
+ this.purchaseSid = purchaseSid;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java
new file mode 100644
index 00000000..e15fed3d
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java
@@ -0,0 +1,25 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class InStoreHouseMainVo implements Vo {
+ private String sid;
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorName; // varchar 50 审核人姓名
+ private String state; // varchar 50 审核状态
+ private String approvedDate; // varchar 50 审核日期
+ private String prodNum; // varchar 50 商品数量
+ private String purchaseSid;//采购申请单的sid
+ private String locationName; //货位名称
+ private String locationId;//货位id
+ private String createTime;//入库日期
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseListing.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseListing.java
new file mode 100644
index 00000000..d97ff587
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseListing.java
@@ -0,0 +1,214 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Positive;
+
+@Accessors(chain = true)
+@TableName("in_storehouse_listing")
+public class InStorehouseListing extends BaseEntity {
+ /*@TableId(type = IdType.AUTO)
+ private Integer id;*/
+ private String custerSid;// varchar 64 客户Sid(企业)
+ private String custerName ;//varchar 100 客户名称(企业)
+ private String storeHouseSid ;//varchar 64 仓库Sid
+ private String storeHouseName ;//varchar 100 仓库名称
+ @NotBlank(message = "质物名称不能为空")
+ private String proName;// varchar 50 质物名称
+ @NotBlank(message = "质物名称不能为空")
+ private String proSid;// varchar 50 质物名称
+ @NotBlank(message = "规格(型号)不能为空")
+ private String proModel ;//varchar 50 规格(型号)
+ private String proUnit ;//varchar 50 规格单位
+ private String manufacturer;// varchar 50 生成厂家(产地)
+ @Positive(message ="数量必须为一个正数" )
+ private String num ;//varchar 10 数量
+ private String weight ;//varchar 50 重量
+ @NotBlank(message = "质权人确认的单价不能为空")
+ private String confirmedPrice;// decime 50 2 质权人确认的单价
+ @NotBlank(message = "核算的价值不能为空")
+ private String calculatedValue ;//decime 50 2 核算的价值
+ private String locationNumber ;//varchar 10 货位号
+ private String locationId ;//varchar 10 货位号id
+ private String mainSid ;//varchar 50 申请单的sid
+ private String purchaseSid;//采购申请单的sid
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+
+ public String getLocationId() {
+ return locationId;
+ }
+
+ public void setLocationId(String locationId) {
+ this.locationId = locationId;
+ }
+
+ public String getCusterSid() {
+ return custerSid;
+ }
+
+ public void setCusterSid(String custerSid) {
+ this.custerSid = custerSid;
+ }
+
+ public String getCusterName() {
+ return custerName;
+ }
+
+ public void setCusterName(String custerName) {
+ this.custerName = custerName;
+ }
+
+ public String getStoreHouseSid() {
+ return storeHouseSid;
+ }
+
+ public void setStoreHouseSid(String storeHouseSid) {
+ this.storeHouseSid = storeHouseSid;
+ }
+
+ public String getStoreHouseName() {
+ return storeHouseName;
+ }
+
+ public void setStoreHouseName(String storeHouseName) {
+ this.storeHouseName = storeHouseName;
+ }
+
+ public String getProName() {
+ return proName;
+ }
+
+ public void setProName(String proName) {
+ this.proName = proName;
+ }
+
+ public String getProSid() {
+ return proSid;
+ }
+
+ public void setProSid(String proSid) {
+ this.proSid = proSid;
+ }
+
+ public String getProModel() {
+ return proModel;
+ }
+
+ public void setProModel(String proModel) {
+ this.proModel = proModel;
+ }
+
+ public String getProUnit() {
+ return proUnit;
+ }
+
+ public void setProUnit(String proUnit) {
+ this.proUnit = proUnit;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getWeight() {
+ return weight;
+ }
+
+ public void setWeight(String weight) {
+ this.weight = weight;
+ }
+
+ public String getConfirmedPrice() {
+ return confirmedPrice;
+ }
+
+ public void setConfirmedPrice(String confirmedPrice) {
+ this.confirmedPrice = confirmedPrice;
+ }
+
+ public String getCalculatedValue() {
+ return calculatedValue;
+ }
+
+ public void setCalculatedValue(String calculatedValue) {
+ this.calculatedValue = calculatedValue;
+ }
+
+ public String getLocationNumber() {
+ return locationNumber;
+ }
+
+ public void setLocationNumber(String locationNumber) {
+ this.locationNumber = locationNumber;
+ }
+
+ public String getMainSid() {
+ return mainSid;
+ }
+
+ public void setMainSid(String mainSid) {
+ this.mainSid = mainSid;
+ }
+
+ public String getPurchaseSid() {
+ return purchaseSid;
+ }
+
+ public void setPurchaseSid(String purchaseSid) {
+ this.purchaseSid = purchaseSid;
+ }
+
+ public String getBrandInfoName() {
+ return brandInfoName;
+ }
+
+ public void setBrandInfoName(String brandInfoName) {
+ this.brandInfoName = brandInfoName;
+ }
+
+ public String getBrandInfoKey() {
+ return brandInfoKey;
+ }
+
+ public void setBrandInfoKey(String brandInfoKey) {
+ this.brandInfoKey = brandInfoKey;
+ }
+
+ public String getProductTypeName() {
+ return productTypeName;
+ }
+
+ public void setProductTypeName(String productTypeName) {
+ this.productTypeName = productTypeName;
+ }
+
+ public String getProductTypeKey() {
+ return productTypeKey;
+ }
+
+ public void setProductTypeKey(String productTypeKey) {
+ this.productTypeKey = productTypeKey;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseMain.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseMain.java
new file mode 100644
index 00000000..7a1d75bf
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseMain.java
@@ -0,0 +1,150 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+@TableName("in_storehouse_main")
+public class InStorehouseMain extends BaseEntity {
+// @TableId(type = IdType.AUTO)
+// private Integer id;
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String creatorSid; //varchar 64 制单人Sid
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerSid; //varchar 64 客户Sid(企业)
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseSid; // varchar 64 仓库Sid
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorSid; //varchar 64 审核人Sid
+ private String auditorName; // varchar 50 审核人姓名
+ private String approvedDate; // varchar 50 审核日期
+ private String approvedRemark; // varchar 50 审核备注
+ private String purchaseSid;//采购申请单的sid
+ private String locationName; //货位名称
+ private String locationId;//货位id
+
+ public String getLocationName() {
+ return locationName;
+ }
+
+ public void setLocationName(String locationName) {
+ this.locationName = locationName;
+ }
+
+ public String getLocationId() {
+ return locationId;
+ }
+
+ public void setLocationId(String locationId) {
+ this.locationId = locationId;
+ }
+
+ public String getNo() {
+ return no;
+ }
+
+ public void setNo(String no) {
+ this.no = no;
+ }
+
+ public String getApplicationDate() {
+ return applicationDate;
+ }
+
+ public void setApplicationDate(String applicationDate) {
+ this.applicationDate = applicationDate;
+ }
+
+ public String getCreatorSid() {
+ return creatorSid;
+ }
+
+ public void setCreatorSid(String creatorSid) {
+ this.creatorSid = creatorSid;
+ }
+
+ public String getCreatorName() {
+ return creatorName;
+ }
+
+ public void setCreatorName(String creatorName) {
+ this.creatorName = creatorName;
+ }
+
+ public String getCusterSid() {
+ return custerSid;
+ }
+
+ public void setCusterSid(String custerSid) {
+ this.custerSid = custerSid;
+ }
+
+ public String getCusterName() {
+ return custerName;
+ }
+
+ public void setCusterName(String custerName) {
+ this.custerName = custerName;
+ }
+
+ public String getStoreHouseSid() {
+ return storeHouseSid;
+ }
+
+ public void setStoreHouseSid(String storeHouseSid) {
+ this.storeHouseSid = storeHouseSid;
+ }
+
+ public String getStoreHouseName() {
+ return storeHouseName;
+ }
+
+ public void setStoreHouseName(String storeHouseName) {
+ this.storeHouseName = storeHouseName;
+ }
+
+ public String getAuditorSid() {
+ return auditorSid;
+ }
+
+ public void setAuditorSid(String auditorSid) {
+ this.auditorSid = auditorSid;
+ }
+
+ public String getAuditorName() {
+ return auditorName;
+ }
+
+ public void setAuditorName(String auditorName) {
+ this.auditorName = auditorName;
+ }
+
+ public String getApprovedDate() {
+ return approvedDate;
+ }
+
+ public void setApprovedDate(String approvedDate) {
+ this.approvedDate = approvedDate;
+ }
+
+ public String getApprovedRemark() {
+ return approvedRemark;
+ }
+
+ public void setApprovedRemark(String approvedRemark) {
+ this.approvedRemark = approvedRemark;
+ }
+
+ public String getPurchaseSid() {
+ return purchaseSid;
+ }
+
+ public void setPurchaseSid(String purchaseSid) {
+ this.purchaseSid = purchaseSid;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java
new file mode 100644
index 00000000..f42ffde4
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java
@@ -0,0 +1,164 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+public class InStorehouseMainQuery implements Query {
+ private String sid;
+ private String no; //varchar 50 编号
+ private String applicationDateStart; //date 50 制单日期开始
+ private String applicationDateEnd; //date 50 制单日期结束
+ private String creatorSid; //varchar 64 制单人Sid
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerSid; //varchar 64 客户Sid(企业)
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseSid; // varchar 64 仓库Sid
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorSid; //varchar 64 审核人Sid
+ private String auditorName; // varchar 50 审核人姓名
+ private String approvedDate; // varchar 50 审核日期
+ private String approvedRemark; // varchar 50 审核备注
+ private String purchaseSid;//采购申请单的sid
+ private String locationName; //货位名称
+ private String locationId;//货位id
+
+ public String getLocationName() {
+ return locationName;
+ }
+
+ public void setLocationName(String locationName) {
+ this.locationName = locationName;
+ }
+
+ public String getLocationId() {
+ return locationId;
+ }
+
+ public void setLocationId(String locationId) {
+ this.locationId = locationId;
+ }
+
+ public String getSid() {
+ return sid;
+ }
+
+ public void setSid(String sid) {
+ this.sid = sid;
+ }
+
+ public String getNo() {
+ return no;
+ }
+
+ public void setNo(String no) {
+ this.no = no;
+ }
+
+ public String getApplicationDateStart() {
+ return applicationDateStart;
+ }
+
+ public void setApplicationDateStart(String applicationDateStart) {
+ this.applicationDateStart = applicationDateStart;
+ }
+
+ public String getApplicationDateEnd() {
+ return applicationDateEnd;
+ }
+
+ public void setApplicationDateEnd(String applicationDateEnd) {
+ this.applicationDateEnd = applicationDateEnd;
+ }
+
+ public String getCreatorSid() {
+ return creatorSid;
+ }
+
+ public void setCreatorSid(String creatorSid) {
+ this.creatorSid = creatorSid;
+ }
+
+ public String getCreatorName() {
+ return creatorName;
+ }
+
+ public void setCreatorName(String creatorName) {
+ this.creatorName = creatorName;
+ }
+
+ public String getCusterSid() {
+ return custerSid;
+ }
+
+ public void setCusterSid(String custerSid) {
+ this.custerSid = custerSid;
+ }
+
+ public String getCusterName() {
+ return custerName;
+ }
+
+ public void setCusterName(String custerName) {
+ this.custerName = custerName;
+ }
+
+ public String getStoreHouseSid() {
+ return storeHouseSid;
+ }
+
+ public void setStoreHouseSid(String storeHouseSid) {
+ this.storeHouseSid = storeHouseSid;
+ }
+
+ public String getStoreHouseName() {
+ return storeHouseName;
+ }
+
+ public void setStoreHouseName(String storeHouseName) {
+ this.storeHouseName = storeHouseName;
+ }
+
+ public String getAuditorSid() {
+ return auditorSid;
+ }
+
+ public void setAuditorSid(String auditorSid) {
+ this.auditorSid = auditorSid;
+ }
+
+ public String getAuditorName() {
+ return auditorName;
+ }
+
+ public void setAuditorName(String auditorName) {
+ this.auditorName = auditorName;
+ }
+
+ public String getApprovedDate() {
+ return approvedDate;
+ }
+
+ public void setApprovedDate(String approvedDate) {
+ this.approvedDate = approvedDate;
+ }
+
+ public String getApprovedRemark() {
+ return approvedRemark;
+ }
+
+ public void setApprovedRemark(String approvedRemark) {
+ this.approvedRemark = approvedRemark;
+ }
+
+ public String getPurchaseSid() {
+ return purchaseSid;
+ }
+
+ public void setPurchaseSid(String purchaseSid) {
+ this.purchaseSid = purchaseSid;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java
new file mode 100644
index 00000000..88e470ae
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java
@@ -0,0 +1,24 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseDetailVo implements Vo {
+ private String sid;
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String outDate; //date 50 制单日期
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseName; // varchar 100 仓库名称
+ private String storeHouseSid; // varchar 100 仓库名称
+ private String auditorName; // varchar 50 审核人姓名
+ private String approvedDate; // varchar 50 审核日期
+ private List list;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseListing.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseListing.java
new file mode 100644
index 00000000..f0e3abfa
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseListing.java
@@ -0,0 +1,48 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Positive;
+
+@Data
+@Accessors(chain = true)
+@TableName("out_storehouse_listing")
+public class OutStorehouseListing extends BaseEntity {
+// @TableId(type = IdType.AUTO)
+// private Integer id;
+ private String custerSid;// varchar 64 客户Sid(企业)
+ private String custerName ;//varchar 100 客户名称(企业)
+ private String storeHouseSid ;//varchar 64 仓库Sid
+ private String storeHouseName ;//varchar 100 仓库名称
+ @NotBlank(message = "质物名称不能为空")
+ private String proName;// varchar 50 质物名称
+ @NotBlank(message = "质物名称不能为空")
+ private String proSid;// varchar 50 质物sid
+ @NotBlank(message = "规格(型号)不能为空")
+ private String proModel ;//varchar 50 规格(型号)
+ private String proUnit ;//varchar 50 规格单位
+ private String manufacturer;// varchar 50 生成厂家(产地)
+ @Positive(message ="数量必须为一个正数" )
+ private String estimateNum ;//varchar 10 预计数量
+ private String estimateWeight ;//varchar 50 预计重量
+ @NotBlank(message = "预计质权人确认的单价不能空")
+ private String estimateConfirmedPrice;// decime 50 2 质权人确认的单价
+ @NotBlank(message = "预计核算的价值不能空")
+ private String estimateCalculatedValue ;//decime 50 2 核算的价值
+ @Positive(message ="数量必须为一个正数" )
+ private String realityNum ;//varchar 10 实际数量
+ private String realityWeight ;//varchar 50 实际重量
+ @NotBlank(message = "实际质权人确认的单价不能空")
+ private String realityConfirmedPrice;// decime 50 2 实际质权人确认
+ @NotBlank(message = "实际核算的价值不能空")
+ private String realityCalculatedValue ;//decime 50 2 实际核算的价值
+ private String locationNumber ;//varchar 10 货位号
+ private String locationId ;//varchar 10 货位号id
+ private String mainSid ;//varchar 50 申请单的sid
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMain.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMain.java
new file mode 100644
index 00000000..247c5641
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMain.java
@@ -0,0 +1,30 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("out_storehouse_main")
+public class OutStorehouseMain extends BaseEntity {
+// @TableId(type = IdType.AUTO)
+// private Integer id;
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String creatorSid; //varchar 64 制单人Sid
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerSid; //varchar 64 客户Sid(企业)
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseSid; // varchar 64 仓库Sid
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorSid; //varchar 64 审核人Sid
+ private String auditorName; // varchar 50 审核人姓名
+ private String approvedDate; // varchar 50 审核日期
+ private String approvedRemark; // varchar 50 审核备注
+ private String outDate; //出库日期
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainDto.java
new file mode 100644
index 00000000..b4eef513
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainDto.java
@@ -0,0 +1,28 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseMainDto {
+ private String sid;
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String creatorSid; //varchar 64 制单人Sid
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerSid; //varchar 64 客户Sid(企业)
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseSid; // varchar 64 仓库Sid
+ private String storeHouseName; // varchar 100 仓库名称
+ private String auditorSid; //varchar 64 审核人Sid
+ private String auditorName; // varchar 50 审核人姓名
+ private String approvedDate; // varchar 50 审核日期
+ private String approvedRemark; // varchar 50 审核备注
+ private List list;
+ private String outDate; //出库日期
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java
new file mode 100644
index 00000000..c15bbac7
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java
@@ -0,0 +1,21 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseMainQuery implements Query {
+ private String sid;
+ private String no; //varchar 50 编号
+ private String applicationDateEnd; //date 50 制单日期
+ private String applicationDateStart; //date 50 制单日期
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerName; // varchar 100 客户名称(企业)
+ private String mainSid; // varchar 100 mainSid
+ private String state;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseVo.java
new file mode 100644
index 00000000..fa0a9244
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/OutStorehouseVo.java
@@ -0,0 +1,26 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseVo implements Vo {
+ private String sid;
+ private String no; //varchar 50 编号
+ private String applicationDate; //date 50 制单日期
+ private String creatorName; /// varchar 50 制单人姓名
+ private String custerName; // varchar 100 客户名称(企业)
+ private String storeHouseName; // varchar 100 仓库名称
+ private String storeHouseSid; // varchar 100 仓库名称
+ private String auditorName; // varchar 50 审核人姓名
+ private String approvedDate; // varchar 50 审核日期
+ private String prodNum; // varchar 50 商品数量
+ private String modifyTime; //修改日期
+ private String state;
+ private String outDate; //出库日期
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStock.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStock.java
new file mode 100644
index 00000000..03ac454b
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStock.java
@@ -0,0 +1,187 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("prod_stock")
+public class ProdStock extends BaseEntity {
+// @TableId(type = IdType.AUTO)
+// private Integer id;
+ private String proName;// varchar 50 质物名称
+ private String proSid;//质物sid
+ private String proModel;// varchar 50 规格(型号)
+ private String manufacturer;// varchar 50 生成厂家(产地)
+ private String num;// varchar 10 数量
+ private String weight;// varchar 50 重量
+ private String confirmedPrice;// decime 50 2 质权人确认的单价
+ private String calculatedValue;// decime 50 2 核算的价值
+ private String locationNumber;// varchar 10 货位号
+ private String custerName;// varchar 50 客户名称(企业)
+ private String proUnit;// varchar 50 规格单位
+ private String custerSid;// varchar 64 客户Sid(企业)
+ private String storeHouseSid;// varchar 64 仓库Sid
+ private String storeHouseName;// varchar 100 仓库名称
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+ private String locationId;//货位号id
+
+ public String getLocationId() {
+ return locationId;
+ }
+
+ public void setLocationId(String locationId) {
+ this.locationId = locationId;
+ }
+
+ public String getProName() {
+ return proName;
+ }
+
+ public void setProName(String proName) {
+ this.proName = proName;
+ }
+
+ public String getProSid() {
+ return proSid;
+ }
+
+ public void setProSid(String proSid) {
+ this.proSid = proSid;
+ }
+
+ public String getProModel() {
+ return proModel;
+ }
+
+ public void setProModel(String proModel) {
+ this.proModel = proModel;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getWeight() {
+ return weight;
+ }
+
+ public void setWeight(String weight) {
+ this.weight = weight;
+ }
+
+ public String getConfirmedPrice() {
+ return confirmedPrice;
+ }
+
+ public void setConfirmedPrice(String confirmedPrice) {
+ this.confirmedPrice = confirmedPrice;
+ }
+
+ public String getCalculatedValue() {
+ return calculatedValue;
+ }
+
+ public void setCalculatedValue(String calculatedValue) {
+ this.calculatedValue = calculatedValue;
+ }
+
+ public String getLocationNumber() {
+ return locationNumber;
+ }
+
+ public void setLocationNumber(String locationNumber) {
+ this.locationNumber = locationNumber;
+ }
+
+ public String getCusterName() {
+ return custerName;
+ }
+
+ public void setCusterName(String custerName) {
+ this.custerName = custerName;
+ }
+
+ public String getProUnit() {
+ return proUnit;
+ }
+
+ public void setProUnit(String proUnit) {
+ this.proUnit = proUnit;
+ }
+
+ public String getCusterSid() {
+ return custerSid;
+ }
+
+ public void setCusterSid(String custerSid) {
+ this.custerSid = custerSid;
+ }
+
+ public String getStoreHouseSid() {
+ return storeHouseSid;
+ }
+
+ public void setStoreHouseSid(String storeHouseSid) {
+ this.storeHouseSid = storeHouseSid;
+ }
+
+ public String getStoreHouseName() {
+ return storeHouseName;
+ }
+
+ public void setStoreHouseName(String storeHouseName) {
+ this.storeHouseName = storeHouseName;
+ }
+
+ public String getBrandInfoName() {
+ return brandInfoName;
+ }
+
+ public void setBrandInfoName(String brandInfoName) {
+ this.brandInfoName = brandInfoName;
+ }
+
+ public String getBrandInfoKey() {
+ return brandInfoKey;
+ }
+
+ public void setBrandInfoKey(String brandInfoKey) {
+ this.brandInfoKey = brandInfoKey;
+ }
+
+ public String getProductTypeName() {
+ return productTypeName;
+ }
+
+ public void setProductTypeName(String productTypeName) {
+ this.productTypeName = productTypeName;
+ }
+
+ public String getProductTypeKey() {
+ return productTypeKey;
+ }
+
+ public void setProductTypeKey(String productTypeKey) {
+ this.productTypeKey = productTypeKey;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockDto.java
new file mode 100644
index 00000000..1bb4eaaf
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockDto.java
@@ -0,0 +1,30 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class ProdStockDto extends BaseEntity {
+ private String proName;// varchar 50 质物名称
+ private String proSid;//质物sid
+ private String proModel;// varchar 50 规格(型号)
+ private String manufacturer;// varchar 50 生成厂家(产地)
+ private String num;// varchar 10 数量
+ private String weight;// varchar 50 重量
+ private String confirmedPrice;// decime 50 2 质权人确认的单价
+ private String calculatedValue;// decime 50 2 核算的价值
+ private String locationNumber;// varchar 10 货位号
+ private String custerName;// varchar 50 客户名称(企业)
+ private String proUnit;// varchar 50 规格单位
+ private String custerSid;// varchar 64 客户Sid(企业)
+ private String storeHouseSid;// varchar 64 仓库Sid
+ private String storeHouseName;// varchar 100 仓库名称
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+ private String locationId;//货位号id
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockQuery.java
new file mode 100644
index 00000000..b98eddb9
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockQuery.java
@@ -0,0 +1,177 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+public class ProdStockQuery implements Query {
+ private String proName;// varchar 50 质物名称
+ private String proSid;//质物sid
+ private String proModel;// varchar 50 规格(型号)
+ private String manufacturer;// varchar 50 生成厂家(产地)
+ private String num;// varchar 10 数量
+ private String weight;// varchar 50 重量
+ private String confirmedPrice;// decime 50 2 质权人确认的单价
+ private String calculatedValue;// decime 50 2 核算的价值
+ private String locationNumber;// varchar 10 货位号
+ private String custerName;// varchar 50 客户名称(企业)
+ private String proUnit;// varchar 50 规格单位
+ private String custerSid;// varchar 64 客户Sid(企业)
+ private String storeHouseSid;// varchar 64 仓库Sid
+ private String storeHouseName;// varchar 100 仓库名称
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+ private String locationId;//货位号id
+
+ public String getLocationId() {
+ return locationId;
+ }
+
+ public void setLocationId(String locationId) {
+ this.locationId = locationId;
+ }
+ public String getProName() {
+ return proName;
+ }
+
+ public void setProName(String proName) {
+ this.proName = proName;
+ }
+
+ public String getProSid() {
+ return proSid;
+ }
+
+ public void setProSid(String proSid) {
+ this.proSid = proSid;
+ }
+
+ public String getProModel() {
+ return proModel;
+ }
+
+ public void setProModel(String proModel) {
+ this.proModel = proModel;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getWeight() {
+ return weight;
+ }
+
+ public void setWeight(String weight) {
+ this.weight = weight;
+ }
+
+ public String getConfirmedPrice() {
+ return confirmedPrice;
+ }
+
+ public void setConfirmedPrice(String confirmedPrice) {
+ this.confirmedPrice = confirmedPrice;
+ }
+
+ public String getCalculatedValue() {
+ return calculatedValue;
+ }
+
+ public void setCalculatedValue(String calculatedValue) {
+ this.calculatedValue = calculatedValue;
+ }
+
+ public String getLocationNumber() {
+ return locationNumber;
+ }
+
+ public void setLocationNumber(String locationNumber) {
+ this.locationNumber = locationNumber;
+ }
+
+ public String getCusterName() {
+ return custerName;
+ }
+
+ public void setCusterName(String custerName) {
+ this.custerName = custerName;
+ }
+
+ public String getProUnit() {
+ return proUnit;
+ }
+
+ public void setProUnit(String proUnit) {
+ this.proUnit = proUnit;
+ }
+
+ public String getCusterSid() {
+ return custerSid;
+ }
+
+ public void setCusterSid(String custerSid) {
+ this.custerSid = custerSid;
+ }
+
+ public String getStoreHouseSid() {
+ return storeHouseSid;
+ }
+
+ public void setStoreHouseSid(String storeHouseSid) {
+ this.storeHouseSid = storeHouseSid;
+ }
+
+ public String getStoreHouseName() {
+ return storeHouseName;
+ }
+
+ public void setStoreHouseName(String storeHouseName) {
+ this.storeHouseName = storeHouseName;
+ }
+
+ public String getBrandInfoName() {
+ return brandInfoName;
+ }
+
+ public void setBrandInfoName(String brandInfoName) {
+ this.brandInfoName = brandInfoName;
+ }
+
+ public String getBrandInfoKey() {
+ return brandInfoKey;
+ }
+
+ public void setBrandInfoKey(String brandInfoKey) {
+ this.brandInfoKey = brandInfoKey;
+ }
+
+ public String getProductTypeName() {
+ return productTypeName;
+ }
+
+ public void setProductTypeName(String productTypeName) {
+ this.productTypeName = productTypeName;
+ }
+
+ public String getProductTypeKey() {
+ return productTypeKey;
+ }
+
+ public void setProductTypeKey(String productTypeKey) {
+ this.productTypeKey = productTypeKey;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockVo.java
new file mode 100644
index 00000000..c2844cdd
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStockVo.java
@@ -0,0 +1,24 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class ProdStockVo implements Vo {
+ private String proName;// varchar 50 质物名称
+ private String proSid;//质物sid
+ private String proModel;// varchar 50 规格(型号)
+ private String manufacturer;// varchar 50 生成厂家(产地)
+ private String num;// varchar 10 数量
+ private String weight;// varchar 50 重量
+ private String confirmedPrice;// decime 50 2 质权人确认的单价
+ private String calculatedValue;// decime 50 2 核算的价值
+ private String locationNumber;// varchar 10 货位号
+ private String custerName;// varchar 50 客户名称(企业)
+ private String proUnit;// varchar 50 规格单位
+ private String custerSid;// varchar 64 客户Sid(企业)
+ private String storeHouseSid;// varchar 64 仓库Sid
+ private String storeHouseName;// varchar 100 仓库名称
+ private String locationId;//货位号id
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStocks.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStocks.java
new file mode 100644
index 00000000..2c26e261
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/ProdStocks.java
@@ -0,0 +1,22 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class ProdStocks {
+ private List list;
+
+ public List getList() {
+ return list;
+ }
+
+ public void setList(List list) {
+ this.list = list;
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/PurchaseInStoreHouseParams.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/PurchaseInStoreHouseParams.java
new file mode 100644
index 00000000..c6807375
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/api/PurchaseInStoreHouseParams.java
@@ -0,0 +1,23 @@
+package com.wh.pojo.api;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PurchaseInStoreHouseParams {
+ //仓库id
+ private String storeHouseSid;
+ //仓库id
+ private String storeHouseName;
+ //采购订单sid
+ private String purchaseSid;
+ //采购订单编号
+ private String purchaseNo;
+ //客户sid
+ private String custerSid;
+ //用户sid
+ private String userSid;
+ //用户sid
+ private String userName;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java
new file mode 100644
index 00000000..ab7b5bb0
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfo.java
+ * Class: com.supervise.api.brandinfo.BrandInfo
+ * Description: 品牌信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息", description = "品牌信息")
+@TableName("brand_info")
+public class BrandInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java
new file mode 100644
index 00000000..d91b98fa
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoVo.java
+ * Class: com.supervise.api.brandinfo.BrandInfoVo
+ * Description: 品牌信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 视图数据详情", description = "品牌信息 视图数据详情")
+public class BrandInfoDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java
new file mode 100644
index 00000000..82ae6127
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoDto.java
+ * Class: com.supervise.api.brandinfo.BrandInfoDto
+ * Description: 品牌信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 数据传输对象", description = "品牌信息 数据传输对象")
+public class BrandInfoDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java
new file mode 100644
index 00000000..c137dcde
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java
@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoQuery.java
+ * Class: com.supervise.api.brandinfo.BrandInfoQuery
+ * Description: 品牌信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 查询条件", description = "品牌信息 查询条件")
+public class BrandInfoQuery implements Query {
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java
new file mode 100644
index 00000000..37ecab4d
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: BrandInfoVo.java
+ * Class: com.supervise.api.brandinfo.BrandInfoVo
+ * Description: 品牌信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 视图数据对象", description = "品牌信息 视图数据对象")
+public class BrandInfoVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("记录版本,锁")
+ private String lock_version; // 记录版本,锁
+ @ApiModelProperty("创建者")
+ private String create_sid; // 创建者
+ @ApiModelProperty("更新者")
+ private String modify_sid; // 更新者
+ @ApiModelProperty("记录是否可用,1:可用,0:不可用")
+ private String is_enable; // 记录是否可用,1:可用,0:不可用
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录创建时间")
+ private Date create_timeStart; // 记录创建时间
+ private Date create_timeEnd; // 记录创建时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("记录最后修改时间")
+ private Date modify_timeStart; // 记录最后修改时间
+ private Date modify_timeEnd; // 记录最后修改时间
+ @ApiModelProperty("记录是否被删除,0:未删除,1:已经删除")
+ private String is_delete; // 记录是否被删除,0:未删除,1:已经删除
+ @ApiModelProperty("代码")
+ private String code; // 代码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommon.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommon.java
new file mode 100644
index 00000000..5d6822e7
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommon.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommon.java
+ * Class: com.supervise.api.dictcommon.DictCommon
+ * Description: 数据字典——数据项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项", description = "数据字典——数据项")
+@TableName("dict_common")
+public class DictCommon extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java
new file mode 100644
index 00000000..abc45429
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonVo.java
+ * Class: com.supervise.api.dictcommon.DictCommonVo
+ * Description: 数据字典——数据项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据详情", description = "数据字典——数据项 视图数据详情")
+public class DictCommonDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java
new file mode 100644
index 00000000..c43e224c
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonDto.java
+ * Class: com.supervise.api.dictcommon.DictCommonDto
+ * Description: 数据字典——数据项 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 数据传输对象", description = "数据字典——数据项 数据传输对象")
+public class DictCommonDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonQuery.java
new file mode 100644
index 00000000..bb2148ec
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonQuery.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonQuery.java
+ * Class: com.supervise.api.dictcommon.DictCommonQuery
+ * Description: 数据字典——数据项 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 查询条件", description = "数据字典——数据项 查询条件")
+public class DictCommonQuery implements Query {
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonVo.java
new file mode 100644
index 00000000..33c79913
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dictcommon/DictCommonVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictCommonVo.java
+ * Class: com.supervise.api.dictcommon.DictCommonVo
+ * Description: 数据字典——数据项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:28
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据对象", description = "数据字典——数据项 视图数据对象")
+public class DictCommonVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型code")
+ private String dictType; // 类型code
+ @ApiModelProperty("key值")
+ private String dictKey; // key值
+ @ApiModelProperty("value值")
+ private String dictValue; // value值
+ @ApiModelProperty("路径")
+ private String sidPath; // 路径
+ @ApiModelProperty("父级sid")
+ private String parentSid; // 父级sid
+ @ApiModelProperty("分组名称")
+ private String groupName; // 分组名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictType.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictType.java
new file mode 100644
index 00000000..1f91d856
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictType.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dicttype;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictType.java
+ * Class: com.supervise.api.dicttype.DictType
+ * Description: 数据字典——数据类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型", description = "数据字典——数据类型")
+@TableName("dict_type")
+public class DictType extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeDetailsVo.java
new file mode 100644
index 00000000..618239de
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeDetailsVo.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dicttype;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeVo.java
+ * Class: com.supervise.api.dicttype.DictTypeVo
+ * Description: 数据字典——数据类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 视图数据详情", description = "数据字典——数据类型 视图数据详情")
+public class DictTypeDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeDto.java
new file mode 100644
index 00000000..baefbf6b
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeDto.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dicttype;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeDto.java
+ * Class: com.supervise.api.dicttype.DictTypeDto
+ * Description: 数据字典——数据类型 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 数据传输对象", description = "数据字典——数据类型 数据传输对象")
+public class DictTypeDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeQuery.java
new file mode 100644
index 00000000..ce7531e9
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeQuery.java
@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dicttype;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeQuery.java
+ * Class: com.supervise.api.dicttype.DictTypeQuery
+ * Description: 数据字典——数据类型 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 查询条件", description = "数据字典——数据类型 查询条件")
+public class DictTypeQuery implements Query {
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeVo.java
new file mode 100644
index 00000000..158339f5
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/dicttype/DictTypeVo.java
@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dicttype;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: DictTypeVo.java
+ * Class: com.supervise.api.dicttype.DictTypeVo
+ * Description: 数据字典——数据类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-11 11:40:29
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 视图数据对象", description = "数据字典——数据类型 视图数据对象")
+public class DictTypeVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("类型代码")
+ private String dictTypeCode; // 类型代码
+ @ApiModelProperty("类型名称")
+ private String dictTypeName; // 类型名称
+ @ApiModelProperty("级别")
+ private String dictTypeLevel; // 级别
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfo.java
new file mode 100644
index 00000000..0842b7d0
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfo.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.entinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: EntInfo.java
+ * Class: com.wh.api.entinfo.EntInfo
+ * Description: 客户信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-13 22:19:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户信息", description = "客户信息")
+@TableName("ent_info")
+public class EntInfo extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty("企业名称")
+ private String name; // 企业名称
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactsPhone; // 联系电话
+ @ApiModelProperty("统一信用代码")
+ private String no; // 统一信用代码
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoDetailsVo.java
new file mode 100644
index 00000000..c4324e93
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoDetailsVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.entinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: EntInfoVo.java
+ * Class: com.wh.api.entinfo.EntInfoVo
+ * Description: 客户信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-13 22:19:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户信息 视图数据详情", description = "客户信息 视图数据详情")
+public class EntInfoDetailsVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("企业名称")
+ private String name; // 企业名称
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactsPhone; // 联系电话
+ @ApiModelProperty("统一信用代码")
+ private String no; // 统一信用代码
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoDto.java
new file mode 100644
index 00000000..9f1a7d14
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoDto.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.entinfo;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: EntInfoDto.java
+ * Class: com.wh.api.entinfo.EntInfoDto
+ * Description: 客户信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-13 22:19:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户信息 数据传输对象", description = "客户信息 数据传输对象")
+public class EntInfoDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("企业名称")
+ private String name; // 企业名称
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactsPhone; // 联系电话
+ @ApiModelProperty("统一信用代码")
+ private String no; // 统一信用代码
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoQuery.java
new file mode 100644
index 00000000..06025d50
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoQuery.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.entinfo;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: EntInfoQuery.java
+ * Class: com.wh.api.entinfo.EntInfoQuery
+ * Description: 客户信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-13 22:19:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户信息 查询条件", description = "客户信息 查询条件")
+public class EntInfoQuery implements Query {
+
+ @ApiModelProperty("企业名称")
+ private String name; // 企业名称
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactsPhone; // 联系电话
+ @ApiModelProperty("统一信用代码")
+ private String no; // 统一信用代码
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoVo.java
new file mode 100644
index 00000000..46f67032
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/entinfo/EntInfoVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.entinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: EntInfoVo.java
+ * Class: com.wh.api.entinfo.EntInfoVo
+ * Description: 客户信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-13 22:19:45
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户信息 视图数据对象", description = "客户信息 视图数据对象")
+public class EntInfoVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("企业名称")
+ private String name; // 企业名称
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String contactsPhone; // 联系电话
+ @ApiModelProperty("统一信用代码")
+ private String no; // 统一信用代码
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java
new file mode 100644
index 00000000..c3b95732
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenew;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: Purchasenew.java
+ * Class: com.wh..api.purchasenew.Purchasenew
+ * Description: 采购订单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单", description = "采购订单")
+@TableName("purchasenew")
+public class Purchasenew extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+// @TableId(type = IdType.AUTO)
+// private Integer id;
+ @ApiModelProperty("订单日期")
+ private String purchaseDate; // 订单日期
+ @ApiModelProperty("订单编号")
+ private String purchaseNo; // 订单编号
+ @ApiModelProperty("采购人员")
+ private String purchasePerson; // 采购人员
+ @ApiModelProperty("采购人员sid")
+ private String purchasePersonSid; // 采购人员sid
+ @ApiModelProperty("客户id")
+ private String custId; // 客户id
+ @ApiModelProperty("客户名称")
+ private String custName; // 客户名称
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商id")
+ private String supplierId; // 供应商id
+ @ApiModelProperty("仓库名称")
+ private String storehouseName; // 仓库名称
+ @ApiModelProperty("仓库id")
+ private String storehouseId; // 仓库id
+ @ApiModelProperty("状态")
+ private String status="1"; // 状态
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java
new file mode 100644
index 00000000..9dc9e7d8
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenew;
+
+
+import com.wh.pojo.purchasenewproduct.PurchasenewProductVo;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewVo.java
+ * Class: com.wh..api.purchasenew.PurchasenewVo
+ * Description: 采购订单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单 视图数据详情", description = "采购订单 视图数据详情")
+public class PurchasenewDetailsVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("订单日期")
+ private String purchaseDate; // 订单日期
+ @ApiModelProperty("订单编号")
+ private String purchaseNo; // 订单编号
+ @ApiModelProperty("采购人员")
+ private String purchasePerson; // 采购人员
+ @ApiModelProperty("采购人员sid")
+ private String purchasePersonSid; // 采购人员sid
+ @ApiModelProperty("客户id")
+ private String custId; // 客户id
+ @ApiModelProperty("客户名称")
+ private String custName; // 客户名称
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商id")
+ private String supplierId; // 供应商id
+ @ApiModelProperty("仓库名称")
+ private String storehouseName; // 仓库名称
+ @ApiModelProperty("仓库id")
+ private String storehouseId; // 仓库id
+ @ApiModelProperty("状态")
+ private String status; // 状态
+ @ApiModelProperty("商品列表数据")
+ List products;
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java
new file mode 100644
index 00000000..fb6285ac
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenew;
+
+
+import com.wh.pojo.purchasenewproduct.PurchasenewProduct;
+import com.wh.pojo.purchasenewproduct.PurchasenewProductDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewDto.java
+ * Class: com.wh..api.purchasenew.PurchasenewDto
+ * Description: 采购订单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单 数据传输对象", description = "采购订单 数据传输对象")
+public class PurchasenewDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("订单日期")
+ private String purchaseDate; // 订单日期
+ @ApiModelProperty("订单编号")
+ private String purchaseNo; // 订单编号
+ @ApiModelProperty("采购人员")
+ private String purchasePerson; // 采购人员
+ @ApiModelProperty("采购人员sid")
+ private String purchasePersonSid; // 采购人员sid
+ @ApiModelProperty("客户id")
+ private String custId; // 客户id
+ @ApiModelProperty("客户名称")
+ private String custName; // 客户名称
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商id")
+ private String supplierId; // 供应商id
+ @ApiModelProperty("仓库名称")
+ private String storehouseName; // 仓库名称
+ @ApiModelProperty("仓库id")
+ private String storehouseId; // 仓库id
+ @ApiModelProperty("商品列表")
+ private List products;
+ }
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewForImportDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewForImportDto.java
new file mode 100644
index 00000000..62b92d09
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewForImportDto.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenew;
+
+
+import com.wh.pojo.purchasenewproduct.PurchasenewProductDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewDto.java
+ * Class: com.wh..api.purchasenew.PurchasenewDto
+ * Description: 采购订单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单 数据传输对象", description = "采购订单 数据传输对象")
+public class PurchasenewForImportDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("订单日期")
+ private String purchaseDate; // 订单日期
+ @ApiModelProperty("订单编号")
+ private String purchaseNo; // 订单编号
+ @ApiModelProperty("采购人员")
+ private String purchasePerson; // 采购人员
+ @ApiModelProperty("采购人员sid")
+ private String purchasePersonSid; // 采购人员sid
+ @ApiModelProperty("客户id")
+ private String custId; // 客户id
+ @ApiModelProperty("客户名称")
+ private String custName; // 客户名称
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商id")
+ private String supplierId; // 供应商id
+ @ApiModelProperty("仓库名称")
+ private String storehouseName; // 仓库名称
+ @ApiModelProperty("仓库id")
+ private String storehouseId; // 仓库id
+ @ApiModelProperty("仓库id")
+ private String locationId;
+ @ApiModelProperty("仓库id")
+ private String locationNumber;
+ @ApiModelProperty("商品列表")
+ private List products;
+ }
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java
new file mode 100644
index 00000000..98d8301e
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenew;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewQuery.java
+ * Class: com.wh..api.purchasenew.PurchasenewQuery
+ * Description: 采购订单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单 查询条件", description = "采购订单 查询条件")
+public class PurchasenewQuery implements Query {
+ @ApiModelProperty("订单日期")
+ private String purchaseDateStart; // 订单日期
+ @ApiModelProperty("订单日期")
+ private String purchaseDateEnd; // 订单日期
+ @ApiModelProperty("订单编号")
+ private String purchaseNo; // 订单编号
+ @ApiModelProperty("采购人员")
+ private String purchasePerson; // 采购人员
+ @ApiModelProperty("采购人员sid")
+ private String purchasePersonSid; // 采购人员sid
+ @ApiModelProperty("客户id")
+ private String custId; // 客户id
+ @ApiModelProperty("客户名称")
+ private String custName; // 客户名称
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商id")
+ private String supplierId; // 供应商id
+ @ApiModelProperty("仓库名称")
+ private String storehouseName; // 仓库名称
+ @ApiModelProperty("仓库id")
+ private String storehouseId; // 仓库id
+// @ApiModelProperty("状态")
+// private String status; // 状态
+ @ApiModelProperty("状态")
+ private String state; // 状态
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java
new file mode 100644
index 00000000..6b612deb
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenew;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewVo.java
+ * Class: com.wh..api.purchasenew.PurchasenewVo
+ * Description: 采购订单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单 视图数据对象", description = "采购订单 视图数据对象")
+public class PurchasenewVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("订单日期")
+ private String purchaseDate; // 订单日期
+ @ApiModelProperty("订单编号")
+ private String purchaseNo; // 订单编号
+ @ApiModelProperty("采购人员")
+ private String purchasePerson; // 采购人员
+ @ApiModelProperty("采购人员sid")
+ private String purchasePersonSid; // 采购人员sid
+ @ApiModelProperty("客户id")
+ private String custId; // 客户id
+ @ApiModelProperty("客户名称")
+ private String custName; // 客户名称
+ @ApiModelProperty("供应商名称")
+ private String supplierName; // 供应商名称
+ @ApiModelProperty("供应商id")
+ private String supplierId; // 供应商id
+ @ApiModelProperty("仓库名称")
+ private String storehouseName; // 仓库名称
+ @ApiModelProperty("仓库id")
+ private String storehouseId; // 仓库id
+ @ApiModelProperty("状态")
+ private String state; // 状态
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java
new file mode 100644
index 00000000..5ffabd5c
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenewproduct;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewProduct.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProduct
+ * Description: purchasenew_product.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "purchasenew_product", description = "purchasenew_product")
+@TableName("purchasenew_product")
+public class PurchasenewProduct extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库Sid")
+ private String storeHouseSid; // 仓库Sid
+ @ApiModelProperty("仓库名称")
+ private String storeHouseName; // 仓库名称
+ @ApiModelProperty("质物名称")
+ private String proName; // 质物名称
+ @ApiModelProperty("规格(型号)")
+ private String proModel; // 规格(型号)
+ @ApiModelProperty("规格单位")
+ private String proUnit; // 规格单位
+ @ApiModelProperty("生成厂家(产地)")
+ private String manufacturer; // 生成厂家(产地)
+ @ApiModelProperty("数量")
+ private String estimateNum; // 数量
+ @ApiModelProperty("重量")
+ private String estimateWeight; // 重量
+ @ApiModelProperty("质权人确认的单价")
+ private String estimateConfirmedPrice; // 质权人确认的单价
+ @ApiModelProperty("核算的价值")
+ private String estimateCalculatedValue; // 核算的价值
+ @ApiModelProperty("实际数量")
+ private String realityNum; // 实际数量
+ @ApiModelProperty("实际重量")
+ private String realityWeight; // 实际重量
+ @ApiModelProperty("实际质权人确认的单价")
+ private String realityConfirmedPrice; // 实际质权人确认的单价
+ @ApiModelProperty("实际核算的价值")
+ private String realityCalculatedValue; // 实际核算的价值
+ @ApiModelProperty("货位号")
+ private String locationNumber; // 货位号
+ @ApiModelProperty("申请单的sid")
+ private String mainSid; // 申请单的sid
+ @ApiModelProperty("质物id")
+ private String proId; // 质物id
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java
new file mode 100644
index 00000000..419893cb
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java
@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenewproduct;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewProductVo.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductVo
+ * Description: purchasenew_product 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "purchasenew_product 视图数据详情", description = "purchasenew_product 视图数据详情")
+public class PurchasenewProductDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库Sid")
+ private String storeHouseSid; // 仓库Sid
+ @ApiModelProperty("仓库名称")
+ private String storeHouseName; // 仓库名称
+ @ApiModelProperty("质物名称")
+ private String proName; // 质物名称
+ @ApiModelProperty("规格(型号)")
+ private String proModel; // 规格(型号)
+ @ApiModelProperty("规格单位")
+ private String proUnit; // 规格单位
+ @ApiModelProperty("生成厂家(产地)")
+ private String manufacturer; // 生成厂家(产地)
+ @ApiModelProperty("数量")
+ private String estimateNum; // 数量
+ @ApiModelProperty("重量")
+ private String estimateWeight; // 重量
+ @ApiModelProperty("质权人确认的单价")
+ private String estimateConfirmedPrice; // 质权人确认的单价
+ @ApiModelProperty("核算的价值")
+ private String estimateCalculatedValue; // 核算的价值
+ @ApiModelProperty("实际数量")
+ private String realityNum; // 实际数量
+ @ApiModelProperty("实际重量")
+ private String realityWeight; // 实际重量
+ @ApiModelProperty("实际质权人确认的单价")
+ private String realityConfirmedPrice; // 实际质权人确认的单价
+ @ApiModelProperty("实际核算的价值")
+ private String realityCalculatedValue; // 实际核算的价值
+ @ApiModelProperty("货位号")
+ private String locationNumber; // 货位号
+ @ApiModelProperty("申请单的sid")
+ private String mainSid; // 申请单的sid
+ @ApiModelProperty("质物id")
+ private String proId; // 质物id
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java
new file mode 100644
index 00000000..1ed0aa46
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenewproduct;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewProductDto.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductDto
+ * Description: purchasenew_product 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "purchasenew_product 数据传输对象", description = "purchasenew_product 数据传输对象")
+public class PurchasenewProductDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库Sid")
+ private String storeHouseSid; // 仓库Sid
+ @ApiModelProperty("仓库名称")
+ private String storeHouseName; // 仓库名称
+ @ApiModelProperty("质物名称")
+ private String proName; // 质物名称
+ @ApiModelProperty("规格(型号)")
+ private String proModel; // 规格(型号)
+ @ApiModelProperty("规格单位")
+ private String proUnit; // 规格单位
+ @ApiModelProperty("生成厂家(产地)")
+ private String manufacturer; // 生成厂家(产地)
+ @ApiModelProperty("数量")
+ private String estimateNum; // 数量
+ @ApiModelProperty("重量")
+ private String estimateWeight; // 重量
+ @ApiModelProperty("质权人确认的单价")
+ private String estimateConfirmedPrice; // 质权人确认的单价
+ @ApiModelProperty("核算的价值")
+ private String estimateCalculatedValue; // 核算的价值
+ @ApiModelProperty("实际数量")
+ private String realityNum; // 实际数量
+ @ApiModelProperty("实际重量")
+ private String realityWeight; // 实际重量
+ @ApiModelProperty("实际质权人确认的单价")
+ private String realityConfirmedPrice; // 实际质权人确认的单价
+ @ApiModelProperty("实际核算的价值")
+ private String realityCalculatedValue; // 实际核算的价值
+ @ApiModelProperty("货位号")
+ private String locationNumber; // 货位号
+ @ApiModelProperty("货位id")
+ private String locationId; // 货位号id
+ @ApiModelProperty("申请单的sid")
+ private String mainSid; // 申请单的sid
+ @ApiModelProperty("质物id")
+ private String proId; // 质物id
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java
new file mode 100644
index 00000000..5eea23f9
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenewproduct;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewProductQuery.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductQuery
+ * Description: purchasenew_product 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "purchasenew_product 查询条件", description = "purchasenew_product 查询条件")
+public class PurchasenewProductQuery implements Query {
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库Sid")
+ private String storeHouseSid; // 仓库Sid
+ @ApiModelProperty("仓库名称")
+ private String storeHouseName; // 仓库名称
+ @ApiModelProperty("质物名称")
+ private String proName; // 质物名称
+ @ApiModelProperty("规格(型号)")
+ private String proModel; // 规格(型号)
+ @ApiModelProperty("规格单位")
+ private String proUnit; // 规格单位
+ @ApiModelProperty("生成厂家(产地)")
+ private String manufacturer; // 生成厂家(产地)
+ @ApiModelProperty("数量")
+ private String estimateNum; // 数量
+ @ApiModelProperty("重量")
+ private String estimateWeight; // 重量
+ @ApiModelProperty("质权人确认的单价")
+ private String estimateConfirmedPrice; // 质权人确认的单价
+ @ApiModelProperty("核算的价值")
+ private String estimateCalculatedValue; // 核算的价值
+ @ApiModelProperty("实际数量")
+ private String realityNum; // 实际数量
+ @ApiModelProperty("实际重量")
+ private String realityWeight; // 实际重量
+ @ApiModelProperty("实际质权人确认的单价")
+ private String realityConfirmedPrice; // 实际质权人确认的单价
+ @ApiModelProperty("实际核算的价值")
+ private String realityCalculatedValue; // 实际核算的价值
+ @ApiModelProperty("货位号")
+ private String locationNumber; // 货位号
+ @ApiModelProperty("申请单的sid")
+ private String mainSid; // 申请单的sid
+ @ApiModelProperty("质物id")
+ private String proId; // 质物id
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java
new file mode 100644
index 00000000..38147132
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.purchasenewproduct;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * Project: warehouse(仓储)
+ * File: PurchasenewProductVo.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductVo
+ * Description: purchasenew_product 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "purchasenew_product 视图数据对象", description = "purchasenew_product 视图数据对象")
+public class PurchasenewProductVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库Sid")
+ private String storeHouseSid; // 仓库Sid
+ @ApiModelProperty("仓库名称")
+ private String storeHouseName; // 仓库名称
+ @ApiModelProperty("质物名称")
+ private String proName; // 质物名称
+ @ApiModelProperty("规格(型号)")
+ private String proModel; // 规格(型号)
+ @ApiModelProperty("规格单位")
+ private String proUnit; // 规格单位
+ @ApiModelProperty("生成厂家(产地)")
+ private String manufacturer; // 生成厂家(产地)
+ @ApiModelProperty("数量")
+ private String estimateNum; // 数量
+ @ApiModelProperty("重量")
+ private String estimateWeight; // 重量
+ @ApiModelProperty("质权人确认的单价")
+ private String estimateConfirmedPrice; // 质权人确认的单价
+ @ApiModelProperty("核算的价值")
+ private String estimateCalculatedValue; // 核算的价值
+ @ApiModelProperty("实际数量")
+ private String realityNum; // 实际数量
+ @ApiModelProperty("实际重量")
+ private String realityWeight; // 实际重量
+ @ApiModelProperty("实际质权人确认的单价")
+ private String realityConfirmedPrice; // 实际质权人确认的单价
+ @ApiModelProperty("实际核算的价值")
+ private String realityCalculatedValue; // 实际核算的价值
+ @ApiModelProperty("货位号")
+ private String locationNumber; // 货位号
+ @ApiModelProperty("申请单的sid")
+ private String mainSid; // 申请单的sid
+ @ApiModelProperty("质物id")
+ private String proId; // 质物id
+ private String brandInfoName;//品牌名称
+ private String brandInfoKey;//品牌名称
+ private String productTypeName;//分类名称
+ private String productTypeKey;//分类key
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouse.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouse.java
new file mode 100644
index 00000000..a40f3ec8
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouse.java
@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouse;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouse.java
+ * Class: com.wh.api.shstorehouse.ShStorehouse
+ * Description: 库房信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房信息表", description = "库房信息表")
+@TableName("sh_storehouse")
+public class ShStorehouse extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库名称")
+ private String name; // 仓库名称
+ @ApiModelProperty("仓库简称")
+ private String simpleName; // 仓库简称
+ @ApiModelProperty("仓库编码")
+ private String code; // 仓库编码
+ @ApiModelProperty("所属省份编码")
+ private String provinceCode; // 所属省份编码
+ @ApiModelProperty("所属省份名称")
+ private String provinceName; // 所属省份名称
+ @ApiModelProperty("所属城市编码")
+ private String cityCode; // 所属城市编码
+ @ApiModelProperty("所属城市名称")
+ private String cityName; // 所属城市名称
+ @ApiModelProperty("所属区县编码")
+ private String countyCode; // 所属区县编码
+ @ApiModelProperty("所属区县名称")
+ private String countyName; // 所属区县名称
+ @ApiModelProperty("区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区")
+ private String regionName; // 区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区
+ @ApiModelProperty("详细地址")
+ private String address; // 详细地址
+ @ApiModelProperty("库房面积")
+ private String acreage; // 库房面积
+ @ApiModelProperty("库房面积")
+ private String storeyHeight; // 库房面积
+ @ApiModelProperty("月租金")
+ private String monthlyPrice; // 月租金
+ @ApiModelProperty("库房性质编码组,多个性质以逗号(,)分隔")
+ private String attributeCodes; // 库房性质编码组,多个性质以逗号(,)分隔
+ @ApiModelProperty("库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房")
+ private String attributeNames; // 库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房
+ @ApiModelProperty("房源")
+ private String housingResource; // 房源
+ @ApiModelProperty("联系人姓名")
+ private String linkerName; // 联系人姓名
+ @ApiModelProperty("联系人电话")
+ private String linkerPhone; // 联系人电话
+ @ApiModelProperty("图片访问url")
+ private String picUrl; // 图片访问url
+ @ApiModelProperty("精度")
+ private String lon;
+ @ApiModelProperty("维度")
+ private String lat;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java
new file mode 100644
index 00000000..9f5c77bb
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDetailsVo.java
@@ -0,0 +1,109 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouse;
+
+
+import com.wh.pojo.shstorehouseattachment.ShStorehouseAttachmentVo;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseVo.java
+ * Class: com.wh.api.shstorehouse.ShStorehouseVo
+ * Description: 库房信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房信息表 视图数据详情", description = "库房信息表 视图数据详情")
+public class ShStorehouseDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库名称")
+ private String name; // 仓库名称
+ @ApiModelProperty("仓库简称")
+ private String simpleName; // 仓库简称
+ @ApiModelProperty("仓库编码")
+ private String code; // 仓库编码
+ @ApiModelProperty("所属省份编码")
+ private String provinceCode; // 所属省份编码
+ @ApiModelProperty("所属省份名称")
+ private String provinceName; // 所属省份名称
+ @ApiModelProperty("所属城市编码")
+ private String cityCode; // 所属城市编码
+ @ApiModelProperty("所属城市名称")
+ private String cityName; // 所属城市名称
+ @ApiModelProperty("所属区县编码")
+ private String countyCode; // 所属区县编码
+ @ApiModelProperty("所属区县名称")
+ private String countyName; // 所属区县名称
+ @ApiModelProperty("区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区")
+ private String regionName; // 区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区
+ @ApiModelProperty("详细地址")
+ private String address; // 详细地址
+ @ApiModelProperty("库房面积")
+ private String acreage; // 库房面积
+ @ApiModelProperty("库房面积")
+ private String storeyHeight; // 库房面积
+ @ApiModelProperty("月租金")
+ private String monthlyPrice; // 月租金
+ @ApiModelProperty("库房性质编码组,多个性质以逗号(,)分隔")
+ private String attributeCodes; // 库房性质编码组,多个性质以逗号(,)分隔
+ @ApiModelProperty("库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房")
+ private String attributeNames; // 库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房
+ @ApiModelProperty("房源")
+ private String housingResource; // 房源
+ @ApiModelProperty("联系人姓名")
+ private String linkerName; // 联系人姓名
+ @ApiModelProperty("联系人电话")
+ private String linkerPhone; // 联系人电话
+ @ApiModelProperty("图片访问url")
+ private String picUrl; // 图片访问url
+ @ApiModelProperty("图片集合")
+ private List pics;
+ @ApiModelProperty("精度")
+ private String lon;
+ @ApiModelProperty("维度")
+ private String lat;
+ private String projectSid;//项目sid
+ private String projectName;//项目名称
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java
new file mode 100644
index 00000000..8f656260
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseDto.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouse;
+
+
+import com.wh.pojo.shstorehouseattribute.ShStorehouseAttributeDto;
+import com.wh.pojo.storehouseproject.StoreHouseProjectDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseDto.java
+ * Class: com.wh.api.shstorehouse.ShStorehouseDto
+ * Description: 库房信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房信息表 数据传输对象", description = "库房信息表 数据传输对象")
+public class ShStorehouseDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库名称")
+ private String name; // 仓库名称
+ @ApiModelProperty("仓库简称")
+ private String simpleName; // 仓库简称
+ @ApiModelProperty("仓库编码")
+ private String code; // 仓库编码
+ @ApiModelProperty("所属省份编码")
+ private String provinceCode; // 所属省份编码
+ @ApiModelProperty("所属省份名称")
+ private String provinceName; // 所属省份名称
+ @ApiModelProperty("所属城市编码")
+ private String cityCode; // 所属城市编码
+ @ApiModelProperty("所属城市名称")
+ private String cityName; // 所属城市名称
+ @ApiModelProperty("所属区县编码")
+ private String countyCode; // 所属区县编码
+ @ApiModelProperty("所属区县名称")
+ private String countyName; // 所属区县名称
+// @ApiModelProperty("区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区")
+// private String regionName; // 区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区
+ @ApiModelProperty("详细地址")
+ private String address; // 详细地址
+ @ApiModelProperty("库房面积")
+ private String acreage; // 库房面积
+ @ApiModelProperty("库房高度")
+ private String storeyHeight; // 库房高度
+ @ApiModelProperty("月租金")
+ private String monthlyPrice; // 月租金
+ @ApiModelProperty("库房性质编码组,多个性质以逗号(,)分隔")
+ private String attributeCodes; // 库房性质编码组,多个性质以逗号(,)分隔
+ @ApiModelProperty("库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房")
+ private String attributeNames; // 库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房
+ @ApiModelProperty("房源")
+ private String housingResource; // 房源
+ @ApiModelProperty("联系人姓名")
+ private String linkerName; // 联系人姓名
+ @ApiModelProperty("联系人电话")
+ private String linkerPhone; // 联系人电话
+ @ApiModelProperty("图片访问url")
+ private String picUrl; // 图片访问url
+ @ApiModelProperty("图片的集合")
+ private List pics=new ArrayList<>();
+ @ApiModelProperty("精度")
+ private String lon;
+ @ApiModelProperty("维度")
+ private String lat;
+ private String projectSid;//项目sid
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseQuery.java
new file mode 100644
index 00000000..a8ea3c9e
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseQuery.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouse;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseQuery.java
+ * Class: com.wh.api.shstorehouse.ShStorehouseQuery
+ * Description: 库房信息表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房信息表 查询条件", description = "库房信息表 查询条件")
+public class ShStorehouseQuery implements Query {
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库名称")
+ private String name; // 仓库名称
+ @ApiModelProperty("仓库简称")
+ private String simpleName; // 仓库简称
+ @ApiModelProperty("仓库编码")
+ private String code; // 仓库编码
+ @ApiModelProperty("所属省份编码")
+ private String provinceCode; // 所属省份编码
+ @ApiModelProperty("所属省份名称")
+ private String provinceName; // 所属省份名称
+ @ApiModelProperty("所属城市编码")
+ private String cityCode; // 所属城市编码
+ @ApiModelProperty("所属城市名称")
+ private String cityName; // 所属城市名称
+ @ApiModelProperty("所属区县编码")
+ private String countyCode; // 所属区县编码
+ @ApiModelProperty("所属区县名称")
+ private String countyName; // 所属区县名称
+ @ApiModelProperty("区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区")
+ private String regionName; // 区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区
+ @ApiModelProperty("详细地址")
+ private String address; // 详细地址
+ @ApiModelProperty("库房面积")
+ private String acreage; // 库房面积
+ @ApiModelProperty("库房面积")
+ private String storeyHeight; // 库房面积
+ @ApiModelProperty("月租金")
+ private String monthlyPrice; // 月租金
+ @ApiModelProperty("库房性质编码组,多个性质以逗号(,)分隔")
+ private String attributeCodes; // 库房性质编码组,多个性质以逗号(,)分隔
+ @ApiModelProperty("库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房")
+ private String attributeNames; // 库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房
+ @ApiModelProperty("房源")
+ private String housingResource; // 房源
+ @ApiModelProperty("联系人姓名")
+ private String linkerName; // 联系人姓名
+ @ApiModelProperty("联系人电话")
+ private String linkerPhone; // 联系人电话
+ @ApiModelProperty("图片访问url")
+ private String picUrl; // 图片访问url
+ @ApiModelProperty("精度")
+ private String lon;
+ @ApiModelProperty("维度")
+ private String lat;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseVo.java
new file mode 100644
index 00000000..0fb3d19e
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouse/ShStorehouseVo.java
@@ -0,0 +1,104 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouse;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseVo.java
+ * Class: com.wh.api.shstorehouse.ShStorehouseVo
+ * Description: 库房信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房信息表 视图数据对象", description = "库房信息表 视图数据对象")
+public class ShStorehouseVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("客户Sid(企业)")
+ private String custerSid; // 客户Sid(企业)
+ @ApiModelProperty("客户名称(企业)")
+ private String custerName; // 客户名称(企业)
+ @ApiModelProperty("仓库名称")
+ private String name; // 仓库名称
+ @ApiModelProperty("仓库简称")
+ private String simpleName; // 仓库简称
+ @ApiModelProperty("仓库编码")
+ private String code; // 仓库编码
+ @ApiModelProperty("所属省份编码")
+ private String provinceCode; // 所属省份编码
+ @ApiModelProperty("所属省份名称")
+ private String provinceName; // 所属省份名称
+ @ApiModelProperty("所属城市编码")
+ private String cityCode; // 所属城市编码
+ @ApiModelProperty("所属城市名称")
+ private String cityName; // 所属城市名称
+ @ApiModelProperty("所属区县编码")
+ private String countyCode; // 所属区县编码
+ @ApiModelProperty("所属区县名称")
+ private String countyName; // 所属区县名称
+ @ApiModelProperty("区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区")
+ private String regionName; // 区域名称,不同级用逗号(,)分隔,如河北省,石家庄市,长安区
+ @ApiModelProperty("详细地址")
+ private String address; // 详细地址
+ @ApiModelProperty("库房面积")
+ private String acreage; // 库房面积
+ @ApiModelProperty("库房面积")
+ private String storeyHeight; // 库房面积
+ @ApiModelProperty("月租金")
+ private String monthlyPrice; // 月租金
+ @ApiModelProperty("库房性质编码组,多个性质以逗号(,)分隔")
+ private String attributeCodes; // 库房性质编码组,多个性质以逗号(,)分隔
+ @ApiModelProperty("库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房")
+ private String attributeNames; // 库房性质名称组,多个性质以逗号(,)分隔,如:电商仓库,物流仓储,厂房
+ @ApiModelProperty("房源")
+ private String housingResource; // 房源
+ @ApiModelProperty("联系人姓名")
+ private String linkerName; // 联系人姓名
+ @ApiModelProperty("联系人电话")
+ private String linkerPhone; // 联系人电话
+ @ApiModelProperty("图片访问url")
+ private String picUrl; // 图片访问url
+ @ApiModelProperty("精度")
+ private String lon;
+ @ApiModelProperty("维度")
+ private String lat;
+ private String shSid;//仓库sid
+ private String projectSid;//项目sid
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachment.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachment.java
new file mode 100644
index 00000000..958e1f98
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachment.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattachment;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttachment.java
+ * Class: com.wh.api.shstorehouseattachment.ShStorehouseAttachment
+ * Description: 库房附件,如合同,图片等.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房附件,如合同,图片等", description = "库房附件,如合同,图片等")
+@TableName("sh_storehouse_attachment")
+public class ShStorehouseAttachment extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("库房sid")
+ private String storehouseSid; // 库房sid
+ @ApiModelProperty("库房名称")
+ private String storehouseName; // 库房名称
+ @ApiModelProperty("文件名称")
+ private String fileName; // 文件名称
+ @ApiModelProperty("文件描述")
+ private String fileDesc; // 文件描述
+ @ApiModelProperty("文件类型,Word,Excel,PDF或图片")
+ private String fileType; // 文件类型,Word,Excel,PDF或图片
+ @ApiModelProperty("文件后缀,如:png,jpg,xls,xlsx")
+ private String fileSuffix; // 文件后缀,如:png,jpg,xls,xlsx
+ @ApiModelProperty("文件在服务器的存放路径")
+ private String filePath; // 文件在服务器的存放路径
+ @ApiModelProperty("文件获取的url地址")
+ private String fileUrl; // 文件获取的url地址
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentDetailsVo.java
new file mode 100644
index 00000000..3d2debdd
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentDetailsVo.java
@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattachment;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttachmentVo.java
+ * Class: com.wh.api.shstorehouseattachment.ShStorehouseAttachmentVo
+ * Description: 库房附件,如合同,图片等 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房附件,如合同,图片等 视图数据详情", description = "库房附件,如合同,图片等 视图数据详情")
+public class ShStorehouseAttachmentDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("库房sid")
+ private String storehouseSid; // 库房sid
+ @ApiModelProperty("库房名称")
+ private String storehouseName; // 库房名称
+ @ApiModelProperty("文件名称")
+ private String fileName; // 文件名称
+ @ApiModelProperty("文件描述")
+ private String fileDesc; // 文件描述
+ @ApiModelProperty("文件类型,Word,Excel,PDF或图片")
+ private String fileType; // 文件类型,Word,Excel,PDF或图片
+ @ApiModelProperty("文件后缀,如:png,jpg,xls,xlsx")
+ private String fileSuffix; // 文件后缀,如:png,jpg,xls,xlsx
+ @ApiModelProperty("文件在服务器的存放路径")
+ private String filePath; // 文件在服务器的存放路径
+ @ApiModelProperty("文件获取的url地址")
+ private String fileUrl; // 文件获取的url地址
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentDto.java
new file mode 100644
index 00000000..717998f7
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentDto.java
@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattachment;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttachmentDto.java
+ * Class: com.wh.api.shstorehouseattachment.ShStorehouseAttachmentDto
+ * Description: 库房附件,如合同,图片等 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房附件,如合同,图片等 数据传输对象", description = "库房附件,如合同,图片等 数据传输对象")
+public class ShStorehouseAttachmentDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("库房sid")
+ private String storehouseSid; // 库房sid
+ @ApiModelProperty("库房名称")
+ private String storehouseName; // 库房名称
+ @ApiModelProperty("文件名称")
+ private String fileName; // 文件名称
+ @ApiModelProperty("文件描述")
+ private String fileDesc; // 文件描述
+ @ApiModelProperty("文件类型,Word,Excel,PDF或图片")
+ private String fileType; // 文件类型,Word,Excel,PDF或图片
+ @ApiModelProperty("文件后缀,如:png,jpg,xls,xlsx")
+ private String fileSuffix; // 文件后缀,如:png,jpg,xls,xlsx
+ @ApiModelProperty("文件在服务器的存放路径")
+ private String filePath; // 文件在服务器的存放路径
+ @ApiModelProperty("文件获取的url地址")
+ private String fileUrl; // 文件获取的url地址
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentQuery.java
new file mode 100644
index 00000000..09cc82bb
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentQuery.java
@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattachment;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttachmentQuery.java
+ * Class: com.wh.api.shstorehouseattachment.ShStorehouseAttachmentQuery
+ * Description: 库房附件,如合同,图片等 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房附件,如合同,图片等 查询条件", description = "库房附件,如合同,图片等 查询条件")
+public class ShStorehouseAttachmentQuery implements Query {
+
+ @ApiModelProperty("库房sid")
+ private String storehouseSid; // 库房sid
+ @ApiModelProperty("库房名称")
+ private String storehouseName; // 库房名称
+ @ApiModelProperty("文件名称")
+ private String fileName; // 文件名称
+ @ApiModelProperty("文件描述")
+ private String fileDesc; // 文件描述
+ @ApiModelProperty("文件类型,Word,Excel,PDF或图片")
+ private String fileType; // 文件类型,Word,Excel,PDF或图片
+ @ApiModelProperty("文件后缀,如:png,jpg,xls,xlsx")
+ private String fileSuffix; // 文件后缀,如:png,jpg,xls,xlsx
+ @ApiModelProperty("文件在服务器的存放路径")
+ private String filePath; // 文件在服务器的存放路径
+ @ApiModelProperty("文件获取的url地址")
+ private String fileUrl; // 文件获取的url地址
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentVo.java
new file mode 100644
index 00000000..47260155
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattachment/ShStorehouseAttachmentVo.java
@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattachment;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttachmentVo.java
+ * Class: com.wh.api.shstorehouseattachment.ShStorehouseAttachmentVo
+ * Description: 库房附件,如合同,图片等 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房附件,如合同,图片等 视图数据对象", description = "库房附件,如合同,图片等 视图数据对象")
+public class ShStorehouseAttachmentVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("库房sid")
+ private String storehouseSid; // 库房sid
+ @ApiModelProperty("库房名称")
+ private String storehouseName; // 库房名称
+ @ApiModelProperty("文件名称")
+ private String fileName; // 文件名称
+ @ApiModelProperty("文件描述")
+ private String fileDesc; // 文件描述
+ @ApiModelProperty("文件类型,Word,Excel,PDF或图片")
+ private String fileType; // 文件类型,Word,Excel,PDF或图片
+ @ApiModelProperty("文件后缀,如:png,jpg,xls,xlsx")
+ private String fileSuffix; // 文件后缀,如:png,jpg,xls,xlsx
+ @ApiModelProperty("文件在服务器的存放路径")
+ private String filePath; // 文件在服务器的存放路径
+ @ApiModelProperty("文件获取的url地址")
+ private String fileUrl; // 文件获取的url地址
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttribute.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttribute.java
new file mode 100644
index 00000000..7b13b056
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttribute.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattribute;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttribute.java
+ * Class: com.wh.api.shstorehouseattribute.ShStorehouseAttribute
+ * Description: 库房性质.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房性质", description = "库房性质")
+@TableName("sh_storehouse_attribute")
+public class ShStorehouseAttribute extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeDetailsVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeDetailsVo.java
new file mode 100644
index 00000000..27ef785c
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeDetailsVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattribute;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttributeVo.java
+ * Class: com.wh.api.shstorehouseattribute.ShStorehouseAttributeVo
+ * Description: 库房性质 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房性质 视图数据详情", description = "库房性质 视图数据详情")
+public class ShStorehouseAttributeDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeDto.java
new file mode 100644
index 00000000..c125f77a
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeDto.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattribute;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttributeDto.java
+ * Class: com.wh.api.shstorehouseattribute.ShStorehouseAttributeDto
+ * Description: 库房性质 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房性质 数据传输对象", description = "库房性质 数据传输对象")
+public class ShStorehouseAttributeDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeQuery.java
new file mode 100644
index 00000000..cd80be44
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeQuery.java
@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattribute;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttributeQuery.java
+ * Class: com.wh.api.shstorehouseattribute.ShStorehouseAttributeQuery
+ * Description: 库房性质 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房性质 查询条件", description = "库房性质 查询条件")
+public class ShStorehouseAttributeQuery implements Query {
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeVo.java
new file mode 100644
index 00000000..f727bb08
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/shstorehouseattribute/ShStorehouseAttributeVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.shstorehouseattribute;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管)
+ * File: ShStorehouseAttributeVo.java
+ * Class: com.wh.api.shstorehouseattribute.ShStorehouseAttributeVo
+ * Description: 库房性质 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-14 23:18:54
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房性质 视图数据对象", description = "库房性质 视图数据对象")
+public class ShStorehouseAttributeVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("编码")
+ private String code; // 编码
+ @ApiModelProperty("名称")
+ private String name; // 名称
+
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java
new file mode 100644
index 00000000..911b0dc4
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProject.java
@@ -0,0 +1,18 @@
+package com.wh.pojo.storehouseproject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+@ApiModel(value = "仓库 项目关联表", description = "仓库项目关联表")
+@TableName("storehouse_project")
+public class StoreHouseProject extends BaseEntity {
+ private String shSid;
+ private String projectSid;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java
new file mode 100644
index 00000000..8f786ecb
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectDto.java
@@ -0,0 +1,19 @@
+package com.wh.pojo.storehouseproject;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class StoreHouseProjectDto implements Dto {
+ private String id;
+ private String sid;
+ private String shSid;//仓库sid
+ private String projectSid;//项目sid
+ private List shSids;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java
new file mode 100644
index 00000000..f67bceba
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectQuery.java
@@ -0,0 +1,16 @@
+package com.wh.pojo.storehouseproject;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class StoreHouseProjectQuery implements Query {
+ private String id;
+ private String sid;
+ private String shSid;
+ private String projectSid;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java
new file mode 100644
index 00000000..61a9b10b
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/pojo/storehouseproject/StoreHouseProjectVo.java
@@ -0,0 +1,16 @@
+package com.wh.pojo.storehouseproject;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class StoreHouseProjectVo implements Vo {
+ private String id;
+ private String sid;
+ private String shSid;
+ private String projectSid;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/Options.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/Options.java
new file mode 100644
index 00000000..45b4ebb0
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/Options.java
@@ -0,0 +1,13 @@
+package com.wh.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class Options {
+ private String value;
+ private String label;
+ private List children;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/PageResult.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/PageResult.java
new file mode 100644
index 00000000..1bb85029
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/PageResult.java
@@ -0,0 +1,15 @@
+package com.wh.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PageResult {
+ private String query;
+ private String entSid;
+ private Integer pageNum;
+ private Integer pageSize;
+ private Long total;
+ private Object rows;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/PickingUser.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/PickingUser.java
new file mode 100644
index 00000000..454f1417
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/PickingUser.java
@@ -0,0 +1,11 @@
+package com.wh.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PickingUser {
+ private String outStorehouseId;
+ private String user;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/QueryInfo.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/QueryInfo.java
new file mode 100644
index 00000000..8946309e
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/QueryInfo.java
@@ -0,0 +1,13 @@
+package com.wh.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class QueryInfo {
+ private String barCode;
+ private String locationId;
+ private String fromLocationId;
+ private Integer count;
+}
diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/SysResult.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/SysResult.java
new file mode 100644
index 00000000..1f2db571
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/vo/SysResult.java
@@ -0,0 +1,74 @@
+package com.wh.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+//@Builder
+//@Data
+@Accessors(chain = true)
+//@NoArgsConstructor
+//@AllArgsConstructor
+public class SysResult {
+
+ private Integer status; //状态码信息 200成功 201失败
+ private String msg; //服务器提示信息
+ private Object data; //服务器返回值
+
+ public SysResult(Integer status, String msg, Object data) {
+ this.status = status;
+ this.msg = msg;
+ this.data = data;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public Object getData() {
+ return data;
+ }
+
+ public void setData(Object data) {
+ this.data = data;
+ }
+
+ public static SysResult fail(){
+ return new com.wh.vo.SysResult(201,"服务器运行失败",null);
+ }
+
+ public static com.wh.vo.SysResult success(){
+ return new com.wh.vo.SysResult(200, "服务器运行成功", null);
+ }
+
+ public static SysResult noAccess(){
+ return new SysResult(202,"无访问权限",null);
+ }
+
+
+ public static SysResult notEnough(){
+ return new SysResult(203,"数量不足",null);
+ }
+
+ public static com.wh.vo.SysResult success(Object data){
+
+ return new com.wh.vo.SysResult(200, "服务器运行成功", data);
+ }
+
+ public static com.wh.vo.SysResult success(String msg, Object data){
+ return new com.wh.vo.SysResult(200, msg, data);
+ }
+}
diff --git a/warehousing-system/project/wh-manage/src/main/resources/application-devv.yml b/warehousing-system/project/wh-manage/src/main/resources/application-devv.yml
index 4a4292aa..99cce00b 100644
--- a/warehousing-system/project/wh-manage/src/main/resources/application-devv.yml
+++ b/warehousing-system/project/wh-manage/src/main/resources/application-devv.yml
@@ -1,24 +1,36 @@
spring:
resources:
static-locations: file:D://supervise
+ datasource:
+ url: jdbc:mysql://39.104.100.138:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
+ username: root
+ password: yxt_mysql_138
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
- datasource:
- url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
- username: root
- #password: 1LAiGz$t1*Iw
- password: root
+ namespace: supervise
+ server-addr: 39.104.100.138:8848
+ register-enabled: false
redis:
database: 3 # Redis数据库索引(默认为0)
- host: 127.0.0.1
+ host: 39.104.100.138
jedis:
pool:
max-active: -1 #连接池最大连接数(使用负值表示没有限制)
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
- password: 123456
+ password:
port: 6379
- timeout: 0 # 连接超时时间(毫秒)
\ No newline at end of file
+ timeout: 0 # 连接超时时间(毫秒)
+
+image:
+ xlsxtmpl: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
+ # xlsxtmpl: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/xlsx-tmpl/
+ upload:
+ path: D:/works/projects/yxt/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
+ # path: D:/works/projects/javaee/yxtgit/supervise/yxt_supervise/supervise-portal/supervise-portal-biz/target/classes/static/upload/
+ url:
+ prefix: http://127.0.0.1:7003/upload/
+ login:
+ path: D:/images/pic-click
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/resources/application-pro.yml b/warehousing-system/project/wh-manage/src/main/resources/application-pro.yml
index 6c9039d5..4e6c31b0 100644
--- a/warehousing-system/project/wh-manage/src/main/resources/application-pro.yml
+++ b/warehousing-system/project/wh-manage/src/main/resources/application-pro.yml
@@ -9,7 +9,6 @@ spring:
url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
username: root
password: 1LAiGz$t1*Iw
- #password: root
redis:
database: 3 # Redis数据库索引(默认为0)
@@ -22,4 +21,13 @@ spring:
min-idle: 0 # 连接池中的最小空闲连接
password: 123456
port: 6379
- timeout: 0 # 连接超时时间(毫秒)
\ No newline at end of file
+ timeout: 0 # 连接超时时间(毫秒)
+
+image:
+ xlsxtmpl: D:/webapps/supervise/xlsx-tmpl/
+ upload:
+ path: D:/webapps/supervise/static/upload/
+ url:
+ prefix: https://supervise.yxtsoft.com/downfile/
+ login:
+ path: D:\\images\\pic-click
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/resources/application-test.yml b/warehousing-system/project/wh-manage/src/main/resources/application-test.yml
new file mode 100644
index 00000000..831a7be0
--- /dev/null
+++ b/warehousing-system/project/wh-manage/src/main/resources/application-test.yml
@@ -0,0 +1,36 @@
+server:
+ port: 19050
+
+spring:
+ resources:
+ static-locations: file:D://supervise
+ datasource:
+ url: jdbc:mysql://172.18.0.4:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true
+ username: root
+ password: yxt_mysql_138
+ cloud:
+ nacos:
+ discovery:
+ namespace: supervise
+ server-addr: 172.18.0.5:8848
+ redis:
+ database: 3 # Redis数据库索引(默认为0)
+ host: 172.18.0.7
+ jedis:
+ pool:
+ max-active: -1 #连接池最大连接数(使用负值表示没有限制)
+ max-idle: 8 #连接池中的最大空闲连接
+ max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+ min-idle: 0 # 连接池中的最小空闲连接
+ password:
+ port: 6379
+ timeout: 0 # 连接超时时间(毫秒)
+
+image:
+ xlsxtmpl: /home/lzh/webapps/supervise/xlsx-tmpl/
+ upload:
+ path: /home/lzh/docker_data/nginx/html/supervise/supervise-portal-ui/upload/
+ url:
+ prefix: http://jg.yyundong.com/upload/
+ login:
+ path: /home/lzh/webapps/supervise/images/pic-click
\ No newline at end of file
diff --git a/warehousing-system/project/wh-manage/src/main/resources/application.yml b/warehousing-system/project/wh-manage/src/main/resources/application.yml
index 4e7e941e..a9d45d26 100644
--- a/warehousing-system/project/wh-manage/src/main/resources/application.yml
+++ b/warehousing-system/project/wh-manage/src/main/resources/application.yml
@@ -10,8 +10,9 @@ spring:
application:
name: supervise-wm
profiles:
- #active: devv
- active: pro
+ active: devv
+# active: test
+# active: pro
messages:
basename: i18n/messages