diff --git a/yxt-wms-biz/docs/databases/tables/create_table_base.sql b/yxt-wms-biz/docs/databases/tables/create_table_base.sql
new file mode 100644
index 0000000000..52a1043939
--- /dev/null
+++ b/yxt-wms-biz/docs/databases/tables/create_table_base.sql
@@ -0,0 +1,326 @@
+
+
+DROP TABLE IF EXISTS `base_goods_spu`;
+CREATE TABLE `base_goods_spu` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+ goodsCode varchar(64) DEFAULT NULL COMMENT '商品代码',
+ barCode varchar(64) DEFAULT NULL COMMENT '条形码',
+ goodsName varchar(200) DEFAULT NULL COMMENT '商品名称',
+ goodsPY varchar(64) DEFAULT NULL COMMENT '拼音缩写',
+ goodsShortName varchar(64) DEFAULT NULL COMMENT '商品简称',
+ externalCode varchar(64) DEFAULT NULL COMMENT '外部编码',
+ factoryCode varchar(64) DEFAULT NULL COMMENT '厂家货号',
+ typeSid varchar(64) DEFAULT NULL COMMENT '分类sid',
+ isListed int DEFAULT NULL COMMENT '是否上架',
+ brandSid varchar(64) DEFAULT NULL COMMENT '品牌sid',
+ manufacturerSid varchar(64) DEFAULT NULL COMMENT '厂家sid',
+ goodsUnitSid varchar(64) DEFAULT NULL COMMENT '商品单位sid',
+ goodsModelSid varchar(64) DEFAULT NULL COMMENT '供应商sid',
+ taxRate decimal(2,2) DEFAULT NULL COMMENT '税率',
+ shelfLife int DEFAULT NULL COMMENT '保质期天',
+ nationalStandardCode varchar(64) DEFAULT NULL COMMENT '国标码',
+ sortNo int DEFAULT NULL COMMENT '排序',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品spu';
+
+DROP TABLE IF EXISTS `base_goods_spu_detail`;
+CREATE TABLE `base_goods_spu_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+ goodSpuSid varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ goodsExplain text DEFAULT NULL COMMENT '商品详细说明',
+ goodsDescription varchar(64) DEFAULT NULL COMMENT '商品描述',
+ length decimal(10,2) DEFAULT NULL COMMENT '长度cm',
+ width decimal(10,2) DEFAULT NULL COMMENT '宽度cm',
+ height decimal(10,2) DEFAULT NULL COMMENT '高度cm',
+ volume decimal(10,2) DEFAULT NULL COMMENT '体积cm3',
+ picUrl varchar(500) DEFAULT NULL COMMENT '图片',
+ producer varchar(200) DEFAULT NULL COMMENT '产地',
+ costPrice decimal(10,2) DEFAULT NULL COMMENT '成本价',
+ tagPrice decimal(10,2) DEFAULT NULL COMMENT '吊牌价',
+ salesPrice decimal(10,2) DEFAULT NULL COMMENT '销售单价',
+ standardPurchasePrice decimal(10,2) DEFAULT NULL COMMENT '标准进价',
+ agencyPrice decimal(10,2) DEFAULT NULL COMMENT '代理价',
+ discount decimal(10,2) DEFAULT NULL COMMENT '折扣',
+ minimumSalesPrice decimal(10,2) DEFAULT NULL COMMENT '最低零售价',
+ safetyStockDays int DEFAULT NULL COMMENT '安全库存天数',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品详情';
+
+DROP TABLE IF EXISTS `base_goods_sku`;
+CREATE TABLE `base_goods_sku` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+ goodsSkuCode varchar(64) DEFAULT NULL COMMENT '商品Sku代码',
+ goodsSkuName varchar(200) DEFAULT NULL COMMENT '商品Sku名称',
+ goodsSpuSid varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ externalCode varchar(64) DEFAULT NULL COMMENT '外部编码',
+ length decimal(10,2) DEFAULT NULL COMMENT '长度cm',
+ width decimal(10,2) DEFAULT NULL COMMENT '宽度cm',
+ height decimal(10,2) DEFAULT NULL COMMENT '高度cm',
+ volume decimal(10,2) DEFAULT NULL COMMENT '体积cm3',
+ colourSid varchar(64) DEFAULT NULL COMMENT '颜色sid',
+ sizeSid varchar(64) DEFAULT NULL COMMENT '尺码sid',
+ grossWeight decimal(10,2) DEFAULT NULL COMMENT '毛重g',
+ netWeight decimal(10,2) DEFAULT NULL COMMENT '净重g',
+ finalPurchasePrice decimal(10,2) DEFAULT NULL COMMENT '最后采购价',
+ safetyStockDays int DEFAULT NULL COMMENT '安全库存天数',
+ isOriginalFactory int DEFAULT NULL COMMENT '是否原厂',
+ isInventoryAlert int DEFAULT NULL COMMENT '是否库存警戒',
+ InventoryAlertUpperLimit int DEFAULT NULL COMMENT '库存警戒上线',
+ InventoryAlertLowerLimit int DEFAULT NULL COMMENT '库存警戒下线',
+ costPrice decimal(10,2) DEFAULT NULL COMMENT '成本价',
+ tagPrice decimal(10,2) DEFAULT NULL COMMENT '吊牌价',
+ salesPrice decimal(10,2) DEFAULT NULL COMMENT '销售单价',
+ standardPurchasePrice decimal(10,2) DEFAULT NULL COMMENT '标准进价',
+ agencyPrice decimal(10,2) DEFAULT NULL COMMENT '代理价',
+ discount decimal(10,2) DEFAULT NULL COMMENT '折扣',
+ minimumSalesPrice decimal(10,2) DEFAULT NULL COMMENT '最低零售价',
+ isLockingSalesPrice int DEFAULT NULL COMMENT '是否锁定销售价',
+ isIntegralExchange int DEFAULT NULL COMMENT '是否可以积分兑换',
+ integralAmount int DEFAULT NULL COMMENT '积分数量',
+ sortNo int DEFAULT NULL COMMENT '排序',
+ picUrl varchar(500) DEFAULT NULL COMMENT '图片',
+ model varchar(200) DEFAULT NULL COMMENT '型号',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品sku';
+
+DROP TABLE IF EXISTS `base_goods_sku_extend`;
+CREATE TABLE `base_goods_sku_extend` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+goodsSkuCode varchar(64) DEFAULT NULL COMMENT '商品Sku代码',
+component varchar(64) DEFAULT NULL COMMENT '成分',
+pattern varchar(64) DEFAULT NULL COMMENT '花纹',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品sku扩展表';
+
+DROP TABLE IF EXISTS `base_goods_type`;
+CREATE TABLE `base_goods_type` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+goodsTypeName varchar(64) DEFAULT NULL COMMENT '商品类别名称',
+goodsTypeCode varchar(64) DEFAULT NULL COMMENT '类别编码',
+percentageRate int DEFAULT NULL COMMENT '提成比例',
+percentageAmount double(10,2) DEFAULT NULL COMMENT '提成金额',
+pSid varchar(64) DEFAULT NULL COMMENT '父级sid',
+isGoodsID int DEFAULT NULL COMMENT '是否一品一码(goodID),0否,1是',
+sortNo int DEFAULT NULL COMMENT '排序',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品类别';
+
+
+DROP TABLE IF EXISTS `base_brand_info`;
+CREATE TABLE `base_brand_info` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+ brandCode varchar(64) DEFAULT NULL COMMENT '品牌代码',
+ brandName varchar(64) DEFAULT NULL COMMENT '品牌名称',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品品牌';
+
+DROP TABLE IF EXISTS `base_goods_unit`;
+CREATE TABLE `base_goods_unit` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+unitName varchar(64) DEFAULT NULL COMMENT '单位名称',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品单位';
+
+DROP TABLE IF EXISTS `base_goods_size`;
+CREATE TABLE `base_goods_size` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+sizeName varchar(64) DEFAULT NULL COMMENT '尺寸名称',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品尺寸';
+
+DROP TABLE IF EXISTS `base_goods_color`;
+CREATE TABLE `base_goods_color` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+colorName varchar(64) DEFAULT NULL COMMENT '颜色名称',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品颜色';
+
+
+DROP TABLE IF EXISTS `base_manufacturer`;
+CREATE TABLE `base_manufacturer` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+manufacturerCode varchar(64) DEFAULT NULL COMMENT '厂家名称',
+manufacturerName varchar(64) DEFAULT NULL COMMENT '厂家编码',
+address varchar(64) DEFAULT NULL COMMENT '地址',
+telephone varchar(64) DEFAULT NULL COMMENT '电话',
+contacts varchar(64) DEFAULT NULL COMMENT '联系人',
+sortNo int DEFAULT NULL COMMENT '排序',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='厂家';
+
+DROP TABLE IF EXISTS `base_markuprate_unified`;
+CREATE TABLE `base_markuprate_unified` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+level varchar(64) DEFAULT NULL COMMENT '级别名称(客户)',
+price double(10,2) DEFAULT NULL COMMENT '对应销售价',
+markuprate int DEFAULT NULL COMMENT '加价率',
+sortNo int DEFAULT NULL COMMENT '排序',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='统一加价率';
+
+DROP TABLE IF EXISTS `base_range_markuprate`;
+CREATE TABLE `base_range_markuprate` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+range_start int DEFAULT NULL COMMENT '区间起始',
+range_end int DEFAULT NULL COMMENT '区间截止',
+markupRate1 int DEFAULT NULL COMMENT '加价率1',
+markupRate2 int DEFAULT NULL COMMENT '加价率2',
+markupRate3 int DEFAULT NULL COMMENT '加价率3',
+markupRate4 int DEFAULT NULL COMMENT '加价率4',
+markupRate5 int DEFAULT NULL COMMENT '加价率5',
+sortNo int DEFAULT NULL COMMENT '排序 ',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='区间加价率';
+
diff --git a/yxt-wms-biz/docs/databases/tables/create_table_purchase.sql b/yxt-wms-biz/docs/databases/tables/create_table_purchase.sql
new file mode 100644
index 0000000000..c02957e822
--- /dev/null
+++ b/yxt-wms-biz/docs/databases/tables/create_table_purchase.sql
@@ -0,0 +1,213 @@
+
+DROP TABLE IF EXISTS `wms_purchase_bill`;
+CREATE TABLE `wms_purchase_bill` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值 0正常,1作废',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+sourceBillSid varchar(64) DEFAULT NULL COMMENT '来源单sid(工单sid)',
+sourceBillNo varchar(64) DEFAULT NULL COMMENT '来源单编号',
+billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
+createDate Varchar(64) DEFAULT NULL COMMENT '单据日期',
+createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
+createByName varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+purchaseType varchar(64) DEFAULT NULL COMMENT '采购类型(厂家采购、外采)',
+supplierSid varchar(64) DEFAULT NULL COMMENT '供应商sid',
+supplierName varchar(64) DEFAULT NULL COMMENT '供应商名称',
+supplierPhone varchar(64) DEFAULT NULL COMMENT '供应商联系电话',
+billType varchar(64) DEFAULT NULL COMMENT '票据类型(不含税、增值税、普通税、已含增值税)',
+markupType varchar(64) DEFAULT NULL COMMENT '加价方式(统一加价率、区间加价率、仓库加价率)',
+priceStrategy varchar(64) DEFAULT NULL COMMENT '进价不同时的价格策略(加权平均、分别计价)',
+isInvoicing int DEFAULT NULL COMMENT '是否需要开发票(是1,否0)',
+invoiceCode varchar(64) DEFAULT NULL COMMENT '发票号码',
+tempMarkupRate int DEFAULT NULL COMMENT '临时加价率',
+purchaserSid varchar(64) DEFAULT NULL COMMENT '采购员sid(单选)',
+purchaserName varchar(64) DEFAULT NULL COMMENT '',
+storekeeperSid varchar(64) DEFAULT NULL COMMENT '库管员sid(单选)',
+storekeeperName varchar(64) DEFAULT NULL COMMENT '',
+errorAmount decimal(10,2) DEFAULT NULL COMMENT '误差调整金额',
+freight decimal(10,2) DEFAULT NULL COMMENT '运费',
+discountAmount decimal(10,2) DEFAULT NULL COMMENT '优惠金额',
+payableAmount decimal(10,2) DEFAULT NULL COMMENT '应付金额(=采购金额+运费-优惠金额)',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='采购单';
+
+DROP TABLE IF EXISTS `wms_purchase_bill_detail`;
+CREATE TABLE `wms_purchase_bill_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '单据sid',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+goodsName varchar(64) DEFAULT NULL COMMENT '商品名称',
+goodsCode varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+specification varchar(64) DEFAULT NULL COMMENT '规格',
+goodsModel varchar(64) DEFAULT NULL COMMENT '型号',
+currentCount double(10,2) DEFAULT NULL COMMENT '当前库存数量',
+unit varchar(64) DEFAULT NULL COMMENT '计量单位',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+position varchar(64) DEFAULT NULL COMMENT '货位',
+cost double(10,2) DEFAULT NULL COMMENT '单位成本(进货价)',
+count double(10,2) DEFAULT NULL COMMENT '采购数量',
+taxAmount double(10,2) DEFAULT NULL COMMENT '税额',
+taxPrice double(10,2) DEFAULT NULL COMMENT '含税价',
+amount double(10,2) DEFAULT NULL COMMENT '采购金额',
+price1 double(10,2) DEFAULT NULL COMMENT '销售价1',
+price2 double(10,2) DEFAULT NULL COMMENT '销售价2',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='采购单据明细';
+
+DROP TABLE IF EXISTS `wms_purchase_bill_settle`;
+CREATE TABLE `wms_purchase_bill_settle` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '采购单sid',
+payableAmount double(10,2) DEFAULT NULL COMMENT '应付金额',
+prepaymentdeductAmount double(10,2) DEFAULT NULL COMMENT '预付款抵扣',
+settleKey varchar(64) DEFAULT NULL COMMENT '结算方式key',
+settleValue varchar(64) DEFAULT NULL COMMENT '结算方式value',
+settleAmount double(10,2) DEFAULT NULL COMMENT '结算金额',
+otherSettleKey varchar(64) DEFAULT NULL COMMENT '其他结算方式',
+otherSettleValue varchar(64) DEFAULT NULL COMMENT '其他结算金额',
+debts double(10,2) DEFAULT NULL COMMENT '欠款金额',
+settleTime datetime DEFAULT NULL COMMENT '结算时间',
+createUserSid varchar(64) DEFAULT NULL COMMENT '结算人sid',
+createByName varchar(64) DEFAULT NULL COMMENT '结算人姓名',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='采购单-结算';
+
+DROP TABLE IF EXISTS `wms_purchaseback_bill`;
+CREATE TABLE `wms_purchaseback_bill` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '0正常,1作废',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+sourceBillSid varchar(64) DEFAULT NULL COMMENT '来源单sid(采购单sid)',
+sourceBillNo varchar(64) DEFAULT NULL COMMENT '来源单编号',
+billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
+createDate varchar(64) DEFAULT NULL COMMENT '单据日期',
+createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
+createByName varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+backErrorAmount double(10,2) DEFAULT NULL COMMENT '退误差调整金额',
+backDiscountAmount double(10,2) DEFAULT NULL COMMENT '退优惠金额',
+deductDebts double(10,2) DEFAULT NULL COMMENT '抵扣欠款',
+deductBillNo varchar(64) DEFAULT NULL COMMENT '抵扣单号',
+toPrepayment double(10,2) DEFAULT NULL COMMENT '转入预付款',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='采购退货单据';
+
+DROP TABLE IF EXISTS `wms_purchaseback_detail`;
+CREATE TABLE `wms_purchaseback_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '单据sid',
+goodsStockSid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+goodsName varchar(64) DEFAULT NULL COMMENT '商品名称',
+goodsCode varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+specification varchar(64) DEFAULT NULL COMMENT '规格',
+goodsModel varchar(64) DEFAULT NULL COMMENT '车型',
+currentCount double(10,2) DEFAULT NULL COMMENT '退货后的库存数量',
+unit varchar(64) DEFAULT NULL COMMENT '计量单位',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+position varchar(64) DEFAULT NULL COMMENT '货位',
+returnedCount double(10,2) DEFAULT NULL COMMENT '已退数量',
+backCount double(10,2) DEFAULT NULL COMMENT '退货数量',
+maxAmount double(10,2) DEFAULT NULL COMMENT '税额',
+maxPrice double(10,2) DEFAULT NULL COMMENT '含税价',
+backAmount double(10,2) DEFAULT NULL COMMENT '退货金额',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='采购退货单据明细';
+
+DROP TABLE IF EXISTS `wms_supplier`;
+CREATE TABLE `wms_supplier` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+supplierName varchar(64) DEFAULT NULL COMMENT '供应商名称',
+supplierCode varchar(64) DEFAULT NULL COMMENT '供应商编码(拼音缩写)',
+contacts varchar(64) DEFAULT NULL COMMENT '联系人',
+mobile varchar(64) DEFAULT NULL COMMENT '联系手机号码',
+contactAddress varchar(100) DEFAULT NULL COMMENT '联系地址',
+taxpayerNo varchar(64) DEFAULT NULL COMMENT '税号',
+bankName varchar(64) DEFAULT NULL COMMENT '开户行',
+bankAccount varchar(64) DEFAULT NULL COMMENT '开户行账号',
+Address varchar(100) DEFAULT NULL COMMENT '地址、电话',
+billType varchar(64) DEFAULT NULL COMMENT '票据类型(不含税、增值税、普通税、已含增值税)',
+sortNo int DEFAULT NULL COMMENT '排序号',
+initDebts decimal(10,2) DEFAULT NULL COMMENT '期初欠款',
+prepayment decimal(10,2) DEFAULT NULL COMMENT '预付款',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='供应商';
+
+
diff --git a/yxt-wms-biz/docs/databases/tables/create_table_warehouse.sql b/yxt-wms-biz/docs/databases/tables/create_table_warehouse.sql
new file mode 100644
index 0000000000..9415c1c28d
--- /dev/null
+++ b/yxt-wms-biz/docs/databases/tables/create_table_warehouse.sql
@@ -0,0 +1,385 @@
+
+DROP TABLE IF EXISTS `wms_inventory`;
+CREATE TABLE `wms_inventory` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+goodsID varchar(64) DEFAULT NULL COMMENT '商品ID(唯一编码,入库时生成)',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+billSid varchar(64) DEFAULT NULL COMMENT '入库单sid',
+billDetailSid varchar(64) DEFAULT NULL COMMENT '入库单明细sid',
+price1 decimal(10,2) DEFAULT NULL COMMENT '销售价格1',
+price2 decimal(10,2) DEFAULT NULL COMMENT '销售价格2',
+price3 decimal(10,2) DEFAULT NULL COMMENT '销售价格3',
+price4 decimal(10,2) DEFAULT NULL COMMENT '销售价格4',
+price5 decimal(10,2) DEFAULT NULL COMMENT '销售价格5',
+unit varchar(64) DEFAULT NULL COMMENT '计量单位',
+count decimal(10,2) DEFAULT NULL COMMENT '库存数量',
+minimumPrice decimal(10,2) DEFAULT NULL COMMENT '销售底价',
+freePrice decimal(10,2) DEFAULT NULL COMMENT '三包价格',
+firstMaintainPrice decimal(10,2) DEFAULT NULL COMMENT '首保价格',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+warehouseArea decimal(10,2) DEFAULT NULL COMMENT '货位',
+isShowDiscount int DEFAULT NULL COMMENT '是否显示折扣标志',
+firstInDate timestamp DEFAULT NULL COMMENT '首次入库日期-计算库龄的依据',
+lockCount decimal(10,2) DEFAULT NULL COMMENT '锁定数量,计算字段,出库申请通过,但未实际出库',
+sortNo int DEFAULT NULL COMMENT '排序',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='商品库存-台账';
+
+DROP TABLE IF EXISTS `wms_inventory_bill`;
+CREATE TABLE `wms_inventory_bill` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值0正常,1作废;申请-审批中-完成-作废',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+sourceBillSid varchar(64) DEFAULT NULL COMMENT '来源单sid',
+billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
+billType varchar(64) DEFAULT NULL COMMENT '单据类型(入库、出库)',
+createDate varchar(64) DEFAULT NULL COMMENT '单据日期',
+createUserSid varchar(64) DEFAULT NULL COMMENT '制单人',
+createByName varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+busTypeKey varchar(64) DEFAULT NULL COMMENT '业务类型key(采购入库、维修出入库、销售出入库等)',
+busTypeValue varchar(64) DEFAULT NULL COMMENT '业务类型value(采购入库、维修出入库、销售出入库等)',
+warehouseManagerSid varchar(64) DEFAULT NULL COMMENT '库管操作人sid',
+warehouseManager varchar(64) DEFAULT NULL COMMENT '库管操作人',
+outTime timestamp DEFAULT NULL COMMENT '实际出库时间',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='出入库单据';
+
+DROP TABLE IF EXISTS `wms_inventory_bill_detail`;
+CREATE TABLE `wms_inventory_bill_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '单据sid',
+inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+goodsName varchar(64) DEFAULT NULL COMMENT '商品名称',
+goodsCode varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+specification varchar(64) DEFAULT NULL COMMENT '规格',
+goodsModel varchar(64) DEFAULT NULL COMMENT '型号',
+currentCount decimal(10,2) DEFAULT NULL COMMENT '出入库后的库存量',
+unit varchar(64) DEFAULT NULL COMMENT '计量单位',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+warehouseArea varchar(64) DEFAULT NULL COMMENT '货位',
+cost decimal(10,2) DEFAULT NULL COMMENT '单位成本(进货价)',
+count decimal(10,2) DEFAULT NULL COMMENT '数量(出库为负)',
+taxAmount decimal(10,2) DEFAULT NULL COMMENT '税额(出库为负)',
+taxPrice decimal(10,2) DEFAULT NULL COMMENT '含税价(出库为负)',
+amount decimal(10,2) DEFAULT NULL COMMENT '金额(出库为负)',
+price1 decimal(10,2) DEFAULT NULL COMMENT '销售价1',
+price2 decimal(10,2) DEFAULT NULL COMMENT '销售价2',
+subjectSid varchar(64) DEFAULT NULL COMMENT '科目sid(出库时)',
+subject varchar(64) DEFAULT NULL COMMENT '科目(出库时)',
+operTime timestamp DEFAULT NULL COMMENT '操作时间',
+operUserSid varchar(64) DEFAULT NULL COMMENT '操作人',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='单据明细';
+
+DROP TABLE IF EXISTS `wms_inventory_checkbill`;
+CREATE TABLE `wms_inventory_checkbill` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
+createDate varchar(64) DEFAULT NULL COMMENT '制单日期',
+createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
+createByName varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+checkType varchar(64) DEFAULT NULL COMMENT '盘点类型',
+checkState decimal(10,2) DEFAULT NULL COMMENT '盘点状态(盘点中1,盘点完成2)',
+profitCount decimal(10,2) DEFAULT NULL COMMENT '盘盈数量',
+profitAmount decimal(10,2) DEFAULT NULL COMMENT '盘盈金额',
+lossCount decimal(10,2) DEFAULT NULL COMMENT '盘亏数量',
+lossAmount decimal(10,2) DEFAULT NULL COMMENT '盈亏金额',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='库存盘点';
+
+DROP TABLE IF EXISTS `wms_inventory_checkbill_detail`;
+CREATE TABLE `wms_inventory_checkbill_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值状态(0正常、2盘亏、1盘盈)',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '盘点单sid',
+inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+goodsName varchar(64) DEFAULT NULL COMMENT '商品名称',
+goodsCode varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+goodsModel varchar(64) DEFAULT NULL COMMENT '型号',
+unit varchar(64) DEFAULT NULL COMMENT '单位',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库',
+warehouseArea varchar(64) DEFAULT NULL COMMENT '货位',
+taxPrice decimal(10,2) DEFAULT NULL COMMENT '含税价',
+bookCount decimal(10,2) DEFAULT NULL COMMENT '账面数量',
+realCount decimal(10,2) DEFAULT NULL COMMENT '实盘数量',
+profitandlossNumber decimal(10,2) DEFAULT NULL COMMENT '盈亏数( |实盘数量-账面数量|)',
+profitandlossAmount decimal(10,2) DEFAULT NULL COMMENT '盈亏金额(盈亏数*含税价)',
+picUrl varchar(1000) DEFAULT NULL COMMENT '现场照片(多张中间用英文逗号分隔)',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='库存盘点-明细';
+
+DROP TABLE IF EXISTS `wms_inventory_allocatebill`;
+CREATE TABLE `wms_inventory_allocatebill` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值状态(未完成0、已完成1)',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
+createDate varchar(64) DEFAULT NULL COMMENT '制单日期',
+createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
+createByName varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+outOrgSid varchar(64) DEFAULT NULL COMMENT '调出分公司sid',
+inOrgSid varchar(64) DEFAULT NULL COMMENT '调入分公司sid',
+count decimal(10,2) DEFAULT NULL COMMENT '调拨数量',
+amount decimal(10,2) DEFAULT NULL COMMENT '调拨金额',
+confirmSid varchar(64) DEFAULT NULL COMMENT '确认人sid',
+confirmName varchar(64) DEFAULT NULL COMMENT '确认人姓名',
+finishTime timestamp DEFAULT NULL COMMENT '完成时间',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='(调拨单)-调出方操作';
+
+DROP TABLE IF EXISTS `wms_inventory_allocatebill_detail`;
+CREATE TABLE `wms_inventory_allocatebill_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '盘点单sid',
+inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+goodsName varchar(64) DEFAULT NULL COMMENT '商品名称',
+goodsCode varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+specification varchar(64) DEFAULT NULL COMMENT '规格',
+goodsModel varchar(64) DEFAULT NULL COMMENT '车型',
+unit varchar(64) DEFAULT NULL COMMENT '单位',
+outWarehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+outWarehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+warehouseAreasid varchar(64) DEFAULT NULL COMMENT '货位sid',
+warehouseArea varchar(64) DEFAULT NULL COMMENT '货位名称',
+taxPrice decimal(10,2) DEFAULT NULL COMMENT '含税价',
+stockCount decimal(10,2) DEFAULT NULL COMMENT '库存数量',
+inWarehouseSid varchar(64) DEFAULT NULL COMMENT '调入仓库sid',
+inWarehouseName varchar(64) DEFAULT NULL COMMENT '调入货位',
+count decimal(10,2) DEFAULT NULL COMMENT '调拨数量',
+amount decimal(10,2) DEFAULT NULL COMMENT '调拨金额(调拨数量*含税价)',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='(调拨单-明细)';
+
+DROP TABLE IF EXISTS `wms_inventory_settlebill`;
+CREATE TABLE `wms_inventory_settlebill` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billNo varchar(64) DEFAULT NULL COMMENT '结算单编号',
+createDate varchar(64) DEFAULT NULL COMMENT '制单日期',
+createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
+createByName varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+settleState int DEFAULT NULL COMMENT '库存结算状态(1进行中 2已完成)',
+settleType int DEFAULT NULL COMMENT '库存结算类型(1月结 2年结)',
+settle_startTime timestamp DEFAULT NULL COMMENT '开始时间',
+settle_endTime timestamp DEFAULT NULL COMMENT '结束时间',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='库存结算单';
+
+DROP TABLE IF EXISTS `wms_inventory_settlebill_detail`;
+CREATE TABLE `wms_inventory_settlebill_detail` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+billSid varchar(64) DEFAULT NULL COMMENT '结算单sid',
+settleType timestamp DEFAULT NULL COMMENT '库存结算类型(1月结 2年结)',
+inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
+goodsCode varchar(64) DEFAULT NULL COMMENT '商品编码',
+goodsName varchar(64) DEFAULT NULL COMMENT '商品名称',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+warehouseCode varchar(64) DEFAULT NULL COMMENT '仓库编码',
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+warehouseAreasid varchar(64) DEFAULT NULL COMMENT '货位sid',
+warehouseAreaCode varchar(64) DEFAULT NULL COMMENT '货位编码',
+warehouseAreaName varchar(64) DEFAULT NULL COMMENT '货位名称',
+preBalance decimal(10,2) DEFAULT NULL COMMENT '上期结存',
+currentBalance decimal(10,2) DEFAULT NULL COMMENT '本期结存',
+currentEnter decimal(10,2) DEFAULT NULL COMMENT '本期入库',
+currentOut decimal(10,2) DEFAULT NULL COMMENT '本期出库',
+currentCheck decimal(10,2) DEFAULT NULL COMMENT '本期盘点',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='库存结算明细';
+
+
+
+DROP TABLE IF EXISTS `base_warehouse`;
+CREATE TABLE `base_warehouse` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
+warehouseCode varchar(64) DEFAULT NULL COMMENT '仓库编码',
+addr varchar(255) DEFAULT NULL COMMENT '具体地址',
+manager varchar(64) DEFAULT NULL COMMENT '仓库管理员',
+markupRate1 int DEFAULT NULL COMMENT '加价率1',
+markupRate2 int DEFAULT NULL COMMENT '加价率2',
+markupRate3 int DEFAULT NULL COMMENT '加价率3',
+markupRate4 int DEFAULT NULL COMMENT '加价率4',
+markupRate5 int DEFAULT NULL COMMENT '加价率5',
+warehouseType int DEFAULT NULL COMMENT '仓库类型(0正常库、1旧件库等)',
+sortNo int DEFAULT NULL COMMENT '排序',
+useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='仓库';
+
+DROP TABLE IF EXISTS `base_warehouse_area`;
+CREATE TABLE `base_warehouse_area` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+areaName varchar(64) DEFAULT NULL COMMENT '库位名称',
+areanCode varchar(64) DEFAULT NULL COMMENT '库位编码',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
+volume double(10,2) DEFAULT NULL COMMENT '库位容量',
+unit varchar(64) DEFAULT NULL COMMENT '计量单位',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='库区';
+
+DROP TABLE IF EXISTS `base_warehouse_rack`;
+CREATE TABLE `base_warehouse_rack` (
+ `id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
+ `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
+ `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
+
+rackName varchar(64) DEFAULT NULL COMMENT '货架名称',
+rackCode varchar(64) DEFAULT NULL COMMENT '货架编码',
+warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid ',
+locationSid varchar(64) DEFAULT NULL COMMENT '库位sid ',
+
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB COMMENT='货架';
\ No newline at end of file
diff --git a/yxt-wms-biz/docs/databases/tables/wms.sql b/yxt-wms-biz/docs/databases/tables/wms.sql
new file mode 100644
index 0000000000..1dd6d6c023
--- /dev/null
+++ b/yxt-wms-biz/docs/databases/tables/wms.sql
@@ -0,0 +1,507 @@
+DROP TABLE IF EXISTS `wms_inventory`;
+CREATE TABLE `wms_inventory`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '1正常、0作废,申请-审批中-完成-作废',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `batchNumber` varchar(64) DEFAULT NULL COMMENT '批次号',
+ `goodsID` varchar(64) DEFAULT NULL COMMENT '商品ID(唯一编码,入库时生成)',
+ `goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ `goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品Sku名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `count` decimal(10, 0) DEFAULT NULL COMMENT '库存数量',
+ `allocateCount` decimal(10, 2) DEFAULT NULL COMMENT '分配量',
+ `pickCount` decimal(10, 2) DEFAULT NULL COMMENT '拣货量',
+ `freezeCount` decimal(10, 2) DEFAULT NULL COMMENT '冻结量',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseRackSid` varchar(64) DEFAULT NULL COMMENT '库位sid',
+ `warehouseRackCode` varchar(64) DEFAULT NULL COMMENT '库位编码',
+ `firstInDate` timestamp null DEFAULT NULL COMMENT '首次入库日期-计算库龄的依据',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='商品库存/台账';
+
+-- 预期到货通知单
+DROP TABLE IF EXISTS `wms_ans_bill`;
+CREATE TABLE `wms_ans_bill`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '外部单号(业务单据编号)',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `busTypeKey` varchar(64) DEFAULT NULL COMMENT '业务类型key(采购预约、调拨预约、其他预约)',
+ `busTypeValue` varchar(64) DEFAULT NULL COMMENT '业务类型value(采购预约、调拨预约、其他预约)',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `billState` int(32) DEFAULT NULL COMMENT '货物状态(在途、部分收货、已收货、已取消)',
+ `reviewStatus` varchar(64) DEFAULT NULL COMMENT '审核状态(待审核、审核通过、审核拒绝)',
+ `refuseReason` varchar(64) DEFAULT NULL COMMENT '拒绝原因',
+ `contact` varchar(64) DEFAULT NULL COMMENT '联系人',
+ `mobile` varchar(64) DEFAULT NULL COMMENT '联系人手机',
+ `supplierSid` varchar(64) DEFAULT NULL COMMENT '供应商sid',
+ `supplierName` varchar(64) DEFAULT NULL COMMENT '供应商名称',
+ `goodsOwnerSid` varchar(64) DEFAULT NULL COMMENT '货主sid',
+ `goodsOwner` varchar(64) DEFAULT NULL COMMENT '货主',
+ `deliveryDate` timestamp null DEFAULT NULL COMMENT '预计到货日期',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='预期到货通知单';
+
+-- 预期到货通知单 货物明细
+DROP TABLE IF EXISTS `wms_ans_bill_detail`;
+CREATE TABLE `wms_ans_bill_detail`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ `goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `cost` decimal(10, 2) DEFAULT NULL COMMENT '单位成本(采购价)',
+ `orderCount` decimal(10, 2) DEFAULT NULL COMMENT '预约数量(采购订单数量)',
+ `waitInCount` int(32) DEFAULT NULL COMMENT '待入库数量-根据收货单计算',
+ `actualInCount` int(32) DEFAULT NULL COMMENT '实际入库数量-根据收货单计算',
+ `taxAmount` decimal(10, 2) DEFAULT NULL COMMENT '税额',
+ `taxPrice` decimal(10, 2) DEFAULT NULL COMMENT '含税价',
+ `amount` decimal(10, 2) DEFAULT NULL COMMENT '金额',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='预期到货通知单-货物明细';
+
+-- 收货单据
+DROP TABLE IF EXISTS `wms_receipt_bill`;
+CREATE TABLE `wms_receipt_bill`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid(asn单sid)',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '来源单号(asn单号)',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `busTypeKey` varchar(64) DEFAULT NULL COMMENT '业务类型key(采购入库、销售退库等)',
+ `busTypeValue` varchar(64) DEFAULT NULL COMMENT '业务类型value(采购入库、销售退库等)',
+ `supplierSid` varchar(64) DEFAULT NULL COMMENT '供应商sid',
+ `supplierName` varchar(64) DEFAULT NULL COMMENT '供应商名称',
+ `goodsOwnerSid` varchar(64) DEFAULT NULL COMMENT '货主sid',
+ `goodsOwner` varchar(64) DEFAULT NULL COMMENT '货主',
+ `deliveryDate` timestamp null DEFAULT NULL COMMENT '到货日期',
+ `billState` int(32) DEFAULT NULL COMMENT '待收货/部分收货/已收货(默认)',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='收货单据';
+
+
+DROP TABLE IF EXISTS `wms_receipt_bill_detail`;
+CREATE TABLE `wms_receipt_bill_detail`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ `goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品Sku名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品sku编码',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseRackSid` varchar(64) DEFAULT NULL COMMENT '库位sid',
+ `warehouseRackName` varchar(64) DEFAULT NULL COMMENT '库位名称',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `orderCount` decimal(10, 2) DEFAULT NULL COMMENT '预约数量',
+ `actualInCount` decimal(10, 2) DEFAULT NULL COMMENT '实收数量',
+ `rejectCount` decimal(10, 2) DEFAULT NULL COMMENT '拒收数量',
+ `rejectReason` varchar(64) DEFAULT NULL COMMENT '拒收原因',
+ `receivingGoodsTime` timestamp null DEFAULT NULL COMMENT '收货时间',
+ `isQuality` int(32) DEFAULT NULL COMMENT '是否需要质检(不需要0,需要1)',
+ `qualityState` int(32) DEFAULT NULL COMMENT '质检状态(合格0,不合格1)',
+ `packageRemark` varchar(200) DEFAULT NULL COMMENT '载具说明',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='收货单据-明细';
+
+-- 批次属性
+DROP TABLE IF EXISTS `wms_receipt_bill_detail_batch`;
+CREATE TABLE `wms_receipt_bill_detail_batch`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `detailSid` varchar(64) DEFAULT NULL COMMENT '收货明细sid',
+ `batchNumber` varchar(64) DEFAULT NULL COMMENT '批次号(收货日期+有效日期,如240320-241009)',
+ `batchCount` decimal(10, 0) DEFAULT NULL COMMENT '数量',
+ `manufactureDate` timestamp null DEFAULT NULL COMMENT '生产日期',
+ `expirationDate` timestamp null DEFAULT NULL COMMENT '有效期(根据spu中有效天数、生产日期计算)',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='批次属性';
+
+
+-- 上架单
+DROP TABLE IF EXISTS `wms_shelf_bill`;
+CREATE TABLE `wms_shelf_bill`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid(收货单sid)',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '来源单号(收货单号)',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `billState` int(64) DEFAULT '0' COMMENT '0新建1已完成',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='上架单';
+
+
+-- 上架单明细
+DROP TABLE IF EXISTS `wms_shelf_bill_detail`;
+CREATE TABLE `wms_shelf_bill_detail`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `receiptDetailSid` varchar(64) DEFAULT NULL COMMENT '收货单明细sid',
+ `batchNumber` varchar(64) DEFAULT NULL COMMENT '批次号(入库日期+有效日期,如240320-241009)',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '库存sid',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseRackSid` varchar(64) DEFAULT NULL COMMENT '库位Sid',
+ `warehouseRackCode` varchar(64) DEFAULT NULL COMMENT '库位编号',
+ `count` decimal(10, 2) DEFAULT NULL COMMENT '上架数量',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='上架单明细';
+
+-- 出库单据
+DROP TABLE IF EXISTS `wms_out_bill`;
+CREATE TABLE `wms_out_bill`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '来源单号',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `busTypeKey` varchar(64) DEFAULT NULL COMMENT '业务类型key',
+ `busTypeValue` varchar(64) DEFAULT NULL COMMENT '业务类型value((销售出库、采购退货出库等))',
+ `goodsOwnerSid` varchar(64) DEFAULT NULL COMMENT '货主sid',
+ `goodsOwner` varchar(64) DEFAULT NULL COMMENT '货主',
+ `billState` int(32) DEFAULT NULL COMMENT '已完成/已发货',
+ `isTogether` int(32) DEFAULT NULL COMMENT '是否一起发货(否0,是1)',
+ `isHandUp` int(32) DEFAULT NULL COMMENT '挂起状态(1挂起,0不挂起,2解锁)',
+ `priority` int(32) DEFAULT NULL COMMENT '优先级',
+ `actualDeliveTime` timestamp null DEFAULT NULL COMMENT '实际发货时间',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='出库单据';
+
+-- 出库单明细
+DROP TABLE IF EXISTS `wms_out_bill_detail`;
+CREATE TABLE `wms_out_bill_detail`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ `goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品Sku名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品sku编码',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `orderCount` decimal(10, 2) DEFAULT NULL COMMENT '订单数量',
+ `remainingCount` decimal(10, 2) DEFAULT NULL COMMENT '未结数量',
+ `adjustCount` decimal(10, 2) DEFAULT NULL COMMENT '调整数量',
+ `distributeCount` decimal(10, 2) DEFAULT NULL COMMENT '分配数量',
+ `deliveryCount` decimal(10, 2) DEFAULT NULL COMMENT '发货数量',
+ `billState` int(32) DEFAULT NULL COMMENT '状态(新建/已发货完成、部分分配、全部分配等)',
+ `deliveTime` timestamp null DEFAULT NULL COMMENT '发货时间',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='出库单-明细';
+
+-- 配货单据
+DROP TABLE IF EXISTS `wms_distribute_bill`;
+CREATE TABLE `wms_distribute_bill`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '出库单sid',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '来源单号(出库单)',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `billState` int(32) DEFAULT NULL COMMENT '配货中/已发货',
+ `isHandUp` int(32) DEFAULT NULL COMMENT '挂起状态(1挂起,0不挂起,2解锁)',
+ `priority` int(32) DEFAULT NULL COMMENT '优先级',
+ `actualDeliveTime` timestamp null DEFAULT NULL COMMENT '实际发货时间',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='配货单据';
+
+-- 配货单明细
+DROP TABLE IF EXISTS `wms_distribute_bill_detail`;
+CREATE TABLE `wms_distribute_bill_detail`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `outBillDetailSid` varchar(64) DEFAULT NULL COMMENT '出库单明细sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ `goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品Sku名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品sku编码',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '库存sid',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseRackSid` varchar(64) DEFAULT NULL COMMENT '库位sid',
+ `warehouseRackCode` varchar(64) DEFAULT NULL COMMENT '库位编号',
+ `distributeCount` decimal(10, 2) DEFAULT NULL COMMENT '配货数量',
+ `deliveryCount` decimal(10, 2) DEFAULT NULL COMMENT '发货数量',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='配货单明细';
+
+
+-- 出入库记录
+DROP TABLE IF EXISTS `wms_inventory_record`;
+CREATE TABLE `wms_inventory_record`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '库存sid',
+ `goodsID` varchar(64) DEFAULT NULL COMMENT '商品ID',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid(业务单sid)',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '来源单据编号',
+ `billType` varchar(64) DEFAULT NULL COMMENT '单据类型(1入库、0出库)',
+ `busTypeKey` varchar(64) DEFAULT NULL COMMENT '业务类型key',
+ `busTypeValue` varchar(64) DEFAULT NULL COMMENT '业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)',
+ `billObjSid` varchar(64) DEFAULT NULL COMMENT '客户/供应商sid,出库是为客户,入库时为供应商',
+ `billObjName` varchar(64) DEFAULT NULL COMMENT '客户/供应商名称',
+ `batchNumber` varchar(64) DEFAULT NULL COMMENT '批次号',
+ `goodSpuSid` varchar(64) DEFAULT NULL COMMENT '商品基础信息Sid',
+ `goodsSpuName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuSid` varchar(64) DEFAULT NULL COMMENT '商品Skusid',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品Sku名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格型号',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseRackSid` varchar(64) DEFAULT NULL COMMENT '库位sid',
+ `warehouseRackCode` varchar(64) DEFAULT NULL COMMENT '库位编号',
+ `currentCount` decimal(10, 2) DEFAULT NULL COMMENT '出入库后的库存量',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `count` decimal(10, 2) DEFAULT NULL COMMENT '数量',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='配货单明细';
+
+DROP TABLE IF EXISTS `wms_old_register`;
+CREATE TABLE `wms_old_register`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '维修工单编号',
+ `billTime` varchar(64) DEFAULT NULL COMMENT '工单创建日期',
+ `customerName` varchar(64) DEFAULT NULL COMMENT '客户名称',
+ `customerSid` varchar(64) DEFAULT NULL COMMENT '客户sid',
+ `vehMark` varchar(64) DEFAULT NULL COMMENT '车牌号',
+ `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号',
+ `shortss` text DEFAULT NULL COMMENT '旧件回收说明',
+ `photos` text DEFAULT NULL COMMENT '旧件照片',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='旧件回收登记';
+
+
+DROP TABLE IF EXISTS `wms_old_inventory`;
+CREATE TABLE `wms_old_inventory`
+(
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `goodsID` varchar(64) DEFAULT NULL COMMENT '商品ID',
+ `goodsSkuTitle` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsSkuCode` varchar(64) DEFAULT NULL COMMENT '商品编码',
+ `manufacturerName` varchar(64) DEFAULT NULL COMMENT '厂家',
+ `goodsSkuOwnSpec` varchar(64) DEFAULT NULL COMMENT '规格',
+ `unit` varchar(64) DEFAULT NULL COMMENT '单位',
+ `count` varchar(64) DEFAULT NULL COMMENT '数量',
+ `inCount` varchar(64) DEFAULT NULL COMMENT '已入库数量',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '维修工单编号',
+ `customerName` varchar(64) DEFAULT NULL COMMENT '客户名称',
+ `vehMark` varchar(64) DEFAULT NULL COMMENT '车牌号',
+ `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号',
+ `shortss` text DEFAULT NULL COMMENT '旧件回收说明',
+ `photos` text DEFAULT NULL COMMENT '旧件照片',
+ PRIMARY KEY (`id`),
+ KEY `id` (`id`)
+) ENGINE = INNODB
+ DEFAULT CHARSET = utf8 COMMENT ='待入库旧件';
+
+
diff --git a/yxt-wms-biz/docs/databases/数据备份/yxt_wms-20240301091036.sql b/yxt-wms-biz/docs/databases/数据备份/yxt_wms-20240301091036.sql
new file mode 100644
index 0000000000..38c918b313
--- /dev/null
+++ b/yxt-wms-biz/docs/databases/数据备份/yxt_wms-20240301091036.sql
@@ -0,0 +1,841 @@
+-- --------------------------------------------------------
+-- 主机: 39.104.100.138
+-- 服务器版本: 8.0.30 - MySQL Community Server - GPL
+-- 服务器操作系统: Linux
+-- HeidiSQL 版本: 12.6.0.6765
+-- --------------------------------------------------------
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET NAMES utf8 */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+
+-- 导出 yxt_wms 的数据库结构
+CREATE DATABASE IF NOT EXISTS `yxt_wms` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
+USE `yxt_wms`;
+
+-- 导出 表 yxt_wms.wms_goods 结构
+DROP TABLE IF EXISTS `wms_goods`;
+CREATE TABLE IF NOT EXISTS `wms_goods` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `barCode` varchar(64) DEFAULT NULL COMMENT '条形码',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `goodsPY` varchar(64) DEFAULT NULL COMMENT '拼音缩写',
+ `goodsTypeSid` varchar(64) DEFAULT NULL COMMENT '商品分类sid',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `goodsModelSid` varchar(64) DEFAULT NULL COMMENT '商品型号sid',
+ `goodsModel` varchar(64) DEFAULT NULL COMMENT '商品型号',
+ `specification` varchar(64) DEFAULT NULL COMMENT '规格',
+ `brandSid` varchar(64) DEFAULT NULL COMMENT '品牌sid',
+ `brand` varchar(64) DEFAULT NULL COMMENT '品牌',
+ `manufacturerSid` varchar(64) DEFAULT NULL COMMENT '厂家sid',
+ `manufacturer` varchar(64) DEFAULT NULL COMMENT '厂家',
+ `producer` varchar(64) DEFAULT NULL COMMENT '产地',
+ `validityDays` int DEFAULT NULL COMMENT '有效期天数',
+ `picUrl` varchar(500) DEFAULT NULL COMMENT '图片',
+ `sortNo` int DEFAULT NULL COMMENT '排序',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='商品基础信息';
+
+-- 正在导出表 yxt_wms.wms_goods 的数据:~0 rows (大约)
+INSERT INTO `wms_goods` (`id`, `sid`, `lockVersion`, `createTime`, `modifyTime`, `state`, `isEnable`, `isDelete`, `remarks`, `createBySid`, `updateBySid`, `barCode`, `goodsName`, `goodsCode`, `goodsPY`, `goodsTypeSid`, `unit`, `goodsModelSid`, `goodsModel`, `specification`, `brandSid`, `brand`, `manufacturerSid`, `manufacturer`, `producer`, `validityDays`, `picUrl`, `sortNo`) VALUES
+ (1, '079c7d2a-fad0-4017-8af3-8be033e6304b', 0, '2024-02-29 06:08:15', '2024-02-29 06:08:15', 1, 1, 0, NULL, NULL, NULL, '8', '表所家', '87', 'elit adipisicing laborum', '11', 'in occaecat voluptate do eu', '61', NULL, 'pariatur fugiat', '70', NULL, '30', NULL, 'fugiat ullamco', 54, '', 1),
+ (2, '3c70386e-a726-47f0-ba70-a60665bc8b7f', 0, '2024-02-29 06:22:01', '2024-02-29 06:22:01', 1, 1, 0, NULL, NULL, NULL, '91', '件第后信同往须', '71', 'sit', '42', 'reprehenderit culpa exercitation velit', '32', NULL, 'sit sed consectetur', '13', NULL, '63', NULL, 'commodo labore', 74, '', 1);
+
+-- 导出 表 yxt_wms.wms_goods_brand 结构
+DROP TABLE IF EXISTS `wms_goods_brand`;
+CREATE TABLE IF NOT EXISTS `wms_goods_brand` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `name` varchar(100) DEFAULT NULL COMMENT '品牌名称',
+ `logo` varchar(1024) DEFAULT NULL COMMENT '品牌logo',
+ `bigPic` varchar(1024) DEFAULT NULL COMMENT '专区大图',
+ `brandStory` text COMMENT '品牌故事',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品品牌';
+
+-- 正在导出表 yxt_wms.wms_goods_brand 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_goods_other 结构
+DROP TABLE IF EXISTS `wms_goods_other`;
+CREATE TABLE IF NOT EXISTS `wms_goods_other` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `isOriginalLogo` int DEFAULT NULL COMMENT '是否有原厂标志',
+ `figure` varchar(64) DEFAULT NULL COMMENT '花纹',
+ `materialCode` varchar(64) DEFAULT NULL COMMENT '材料编码',
+ `isWarning` int DEFAULT NULL COMMENT '是否库存预警',
+ `maximum` int DEFAULT NULL COMMENT '上限数量',
+ `minimum` int DEFAULT NULL COMMENT '下限数量',
+ `isScore` int DEFAULT NULL COMMENT '是否积分',
+ `islockPrice` int DEFAULT NULL COMMENT '是否锁定销售价',
+ `useScore` int DEFAULT NULL COMMENT '所需积分',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品其他信息';
+
+-- 正在导出表 yxt_wms.wms_goods_other 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_goods_type 结构
+DROP TABLE IF EXISTS `wms_goods_type`;
+CREATE TABLE IF NOT EXISTS `wms_goods_type` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `goodsTypeName` varchar(64) DEFAULT NULL COMMENT '商品类别名称',
+ `goodsTypeCode` varchar(64) DEFAULT NULL COMMENT '类别编码',
+ `percentageRate` int DEFAULT NULL COMMENT '提成比例',
+ `percentageAmount` double(10,2) DEFAULT NULL COMMENT '提成金额',
+ `pSid` varchar(64) DEFAULT NULL COMMENT '父级sid',
+ `isGoodsID` int DEFAULT NULL COMMENT '是否一品一码(goodID),0否,1是',
+ `sortNo` int DEFAULT NULL COMMENT '排序',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='商品类别';
+
+-- 正在导出表 yxt_wms.wms_goods_type 的数据:~1 rows (大约)
+INSERT INTO `wms_goods_type` (`id`, `sid`, `lockVersion`, `createTime`, `modifyTime`, `state`, `isEnable`, `isDelete`, `remarks`, `createBySid`, `updateBySid`, `goodsTypeName`, `goodsTypeCode`, `percentageRate`, `percentageAmount`, `pSid`, `isGoodsID`, `sortNo`, `useOrgSid`, `createOrgSid`) VALUES
+ (1, '2ca961b0-0d65-4380-952e-569cd80b3eb5', 0, '2024-02-29 06:27:26', '2024-02-29 06:27:26', 1, 1, 0, NULL, NULL, NULL, '清立导白度', '78', 85, 73.07, NULL, 42, 90, '36', '54');
+
+-- 导出 表 yxt_wms.wms_inventory 结构
+DROP TABLE IF EXISTS `wms_inventory`;
+CREATE TABLE IF NOT EXISTS `wms_inventory` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `goodsID` varchar(64) DEFAULT NULL COMMENT '商品ID(唯一编码,入库时生成)',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '入库单sid',
+ `billDetailSid` varchar(64) DEFAULT NULL COMMENT '入库单明细sid',
+ `price1` decimal(10,2) DEFAULT NULL COMMENT '销售价格1',
+ `price2` decimal(10,2) DEFAULT NULL COMMENT '销售价格2',
+ `price3` decimal(10,2) DEFAULT NULL COMMENT '销售价格3',
+ `price4` decimal(10,2) DEFAULT NULL COMMENT '销售价格4',
+ `price5` decimal(10,2) DEFAULT NULL COMMENT '销售价格5',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `count` decimal(10,2) DEFAULT NULL COMMENT '库存数量',
+ `minimumPrice` decimal(10,2) DEFAULT NULL COMMENT '销售底价',
+ `freePrice` decimal(10,2) DEFAULT NULL COMMENT '三包价格',
+ `firstMaintainPrice` decimal(10,2) DEFAULT NULL COMMENT '首保价格',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseArea` decimal(10,2) DEFAULT NULL COMMENT '货位',
+ `isShowDiscount` int DEFAULT NULL COMMENT '是否显示折扣标志',
+ `firstInDate` timestamp NULL DEFAULT NULL COMMENT '首次入库日期-计算库龄的依据',
+ `lockCount` decimal(10,2) DEFAULT NULL COMMENT '锁定数量,计算字段,出库申请通过,但未实际出库',
+ `sortNo` int DEFAULT NULL COMMENT '排序',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品库存-台账';
+
+-- 正在导出表 yxt_wms.wms_inventory 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_allocatebill 结构
+DROP TABLE IF EXISTS `wms_inventory_allocatebill`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_allocatebill` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值状态(未完成0、已完成1)',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createDate` varchar(64) DEFAULT NULL COMMENT '制单日期',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '制单人sid',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `outOrgSid` varchar(64) DEFAULT NULL COMMENT '调出分公司sid',
+ `inOrgSid` varchar(64) DEFAULT NULL COMMENT '调入分公司sid',
+ `count` decimal(10,2) DEFAULT NULL COMMENT '调拨数量',
+ `amount` decimal(10,2) DEFAULT NULL COMMENT '调拨金额',
+ `confirmSid` varchar(64) DEFAULT NULL COMMENT '确认人sid',
+ `confirmName` varchar(64) DEFAULT NULL COMMENT '确认人姓名',
+ `finishTime` timestamp NULL DEFAULT NULL COMMENT '完成时间',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='(调拨单)-调出方操作';
+
+-- 正在导出表 yxt_wms.wms_inventory_allocatebill 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_allocatebill_detail 结构
+DROP TABLE IF EXISTS `wms_inventory_allocatebill_detail`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_allocatebill_detail` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '盘点单sid',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `specification` varchar(64) DEFAULT NULL COMMENT '规格',
+ `goodsModel` varchar(64) DEFAULT NULL COMMENT '车型',
+ `unit` varchar(64) DEFAULT NULL COMMENT '单位',
+ `outWarehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `outWarehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseAreasid` varchar(64) DEFAULT NULL COMMENT '货位sid',
+ `warehouseArea` varchar(64) DEFAULT NULL COMMENT '货位名称',
+ `taxPrice` decimal(10,2) DEFAULT NULL COMMENT '含税价',
+ `stockCount` decimal(10,2) DEFAULT NULL COMMENT '库存数量',
+ `inWarehouseSid` varchar(64) DEFAULT NULL COMMENT '调入仓库sid',
+ `inWarehouseName` varchar(64) DEFAULT NULL COMMENT '调入货位',
+ `count` decimal(10,2) DEFAULT NULL COMMENT '调拨数量',
+ `amount` decimal(10,2) DEFAULT NULL COMMENT '调拨金额(调拨数量*含税价)',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='(调拨单-明细)';
+
+-- 正在导出表 yxt_wms.wms_inventory_allocatebill_detail 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_bill 结构
+DROP TABLE IF EXISTS `wms_inventory_bill`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_bill` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值0正常,1作废;申请-审批中-完成-作废',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `billType` varchar(64) DEFAULT NULL COMMENT '单据类型(入库、出库)',
+ `createDate` varchar(64) DEFAULT NULL COMMENT '单据日期',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '制单人',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `busTypeKey` varchar(64) DEFAULT NULL COMMENT '业务类型key(采购入库、维修出入库、销售出入库等)',
+ `busTypeValue` varchar(64) DEFAULT NULL COMMENT '业务类型value(采购入库、维修出入库、销售出入库等)',
+ `warehouseManagerSid` varchar(64) DEFAULT NULL COMMENT '库管操作人sid',
+ `warehouseManager` varchar(64) DEFAULT NULL COMMENT '库管操作人',
+ `outTime` timestamp NULL DEFAULT NULL COMMENT '实际出库时间',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='出入库单据';
+
+-- 正在导出表 yxt_wms.wms_inventory_bill 的数据:~0 rows (大约)
+INSERT INTO `wms_inventory_bill` (`id`, `sid`, `lockVersion`, `createTime`, `modifyTime`, `state`, `isEnable`, `isDelete`, `remarks`, `createBySid`, `updateBySid`, `sourceBillSid`, `billNo`, `billType`, `createDate`, `createUserSid`, `createByName`, `busTypeKey`, `busTypeValue`, `warehouseManagerSid`, `warehouseManager`, `outTime`, `useOrgSid`, `createOrgSid`) VALUES
+ (1, '1', 0, '2024-02-29 07:26:12', '2024-02-29 07:26:12', 1, 1, 0, NULL, '1', NULL, '1', '1', NULL, '2020', NULL, '1', '1', '1', '1', '1', '2024-02-29 07:26:00', '1', '1');
+
+-- 导出 表 yxt_wms.wms_inventory_bill_detail 结构
+DROP TABLE IF EXISTS `wms_inventory_bill_detail`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_bill_detail` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `specification` varchar(64) DEFAULT NULL COMMENT '规格',
+ `goodsModel` varchar(64) DEFAULT NULL COMMENT '型号',
+ `currentCount` decimal(10,2) DEFAULT NULL COMMENT '出入库后的库存量',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseArea` varchar(64) DEFAULT NULL COMMENT '货位',
+ `cost` decimal(10,2) DEFAULT NULL COMMENT '单位成本(进货价)',
+ `count` decimal(10,2) DEFAULT NULL COMMENT '数量(出库为负)',
+ `taxAmount` decimal(10,2) DEFAULT NULL COMMENT '税额(出库为负)',
+ `taxPrice` decimal(10,2) DEFAULT NULL COMMENT '含税价(出库为负)',
+ `amount` decimal(10,2) DEFAULT NULL COMMENT '金额(出库为负)',
+ `price1` decimal(10,2) DEFAULT NULL COMMENT '销售价1',
+ `price2` decimal(10,2) DEFAULT NULL COMMENT '销售价2',
+ `subjectSid` varchar(64) DEFAULT NULL COMMENT '科目sid(出库时)',
+ `subject` varchar(64) DEFAULT NULL COMMENT '科目(出库时)',
+ `operTime` timestamp NULL DEFAULT NULL COMMENT '操作时间',
+ `operUserSid` varchar(64) DEFAULT NULL COMMENT '操作人',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='单据明细';
+
+-- 正在导出表 yxt_wms.wms_inventory_bill_detail 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_checkbill 结构
+DROP TABLE IF EXISTS `wms_inventory_checkbill`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_checkbill` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createDate` varchar(64) DEFAULT NULL COMMENT '制单日期',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '制单人sid',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `checkType` varchar(64) DEFAULT NULL COMMENT '盘点类型',
+ `checkState` decimal(10,2) DEFAULT NULL COMMENT '盘点状态(盘点中1,盘点完成2)',
+ `profitCount` decimal(10,2) DEFAULT NULL COMMENT '盘盈数量',
+ `profitAmount` decimal(10,2) DEFAULT NULL COMMENT '盘盈金额',
+ `lossCount` decimal(10,2) DEFAULT NULL COMMENT '盘亏数量',
+ `lossAmount` decimal(10,2) DEFAULT NULL COMMENT '盈亏金额',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存盘点';
+
+-- 正在导出表 yxt_wms.wms_inventory_checkbill 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_checkbill_detail 结构
+DROP TABLE IF EXISTS `wms_inventory_checkbill_detail`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_checkbill_detail` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值状态(0正常、2盘亏、1盘盈)',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '盘点单sid',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `goodsModel` varchar(64) DEFAULT NULL COMMENT '型号',
+ `unit` varchar(64) DEFAULT NULL COMMENT '单位',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库',
+ `warehouseArea` varchar(64) DEFAULT NULL COMMENT '货位',
+ `taxPrice` decimal(10,2) DEFAULT NULL COMMENT '含税价',
+ `bookCount` decimal(10,2) DEFAULT NULL COMMENT '账面数量',
+ `realCount` decimal(10,2) DEFAULT NULL COMMENT '实盘数量',
+ `profitandlossNumber` decimal(10,2) DEFAULT NULL COMMENT '盈亏数( |实盘数量-账面数量|)',
+ `profitandlossAmount` decimal(10,2) DEFAULT NULL COMMENT '盈亏金额(盈亏数*含税价)',
+ `picUrl` varchar(1000) DEFAULT NULL COMMENT '现场照片(多张中间用英文逗号分隔)',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存盘点-明细';
+
+-- 正在导出表 yxt_wms.wms_inventory_checkbill_detail 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_settlebill 结构
+DROP TABLE IF EXISTS `wms_inventory_settlebill`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_settlebill` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '结算单编号',
+ `createDate` varchar(64) DEFAULT NULL COMMENT '制单日期',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '制单人sid',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `settleState` int DEFAULT NULL COMMENT '库存结算状态(1进行中 2已完成)',
+ `settleType` int DEFAULT NULL COMMENT '库存结算类型(1月结 2年结)',
+ `settle_startTime` timestamp NULL DEFAULT NULL COMMENT '开始时间',
+ `settle_endTime` timestamp NULL DEFAULT NULL COMMENT '结束时间',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存结算单';
+
+-- 正在导出表 yxt_wms.wms_inventory_settlebill 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_inventory_settlebill_detail 结构
+DROP TABLE IF EXISTS `wms_inventory_settlebill_detail`;
+CREATE TABLE IF NOT EXISTS `wms_inventory_settlebill_detail` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '结算单sid',
+ `settleType` timestamp NULL DEFAULT NULL COMMENT '库存结算类型(1月结 2年结)',
+ `inventorySid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseCode` varchar(64) DEFAULT NULL COMMENT '仓库编码',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseAreasid` varchar(64) DEFAULT NULL COMMENT '货位sid',
+ `warehouseAreaCode` varchar(64) DEFAULT NULL COMMENT '货位编码',
+ `warehouseAreaName` varchar(64) DEFAULT NULL COMMENT '货位名称',
+ `preBalance` decimal(10,2) DEFAULT NULL COMMENT '上期结存',
+ `currentBalance` decimal(10,2) DEFAULT NULL COMMENT '本期结存',
+ `currentEnter` decimal(10,2) DEFAULT NULL COMMENT '本期入库',
+ `currentOut` decimal(10,2) DEFAULT NULL COMMENT '本期出库',
+ `currentCheck` decimal(10,2) DEFAULT NULL COMMENT '本期盘点',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库存结算明细';
+
+-- 正在导出表 yxt_wms.wms_inventory_settlebill_detail 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_manufacturer 结构
+DROP TABLE IF EXISTS `wms_manufacturer`;
+CREATE TABLE IF NOT EXISTS `wms_manufacturer` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `manufacturerCode` varchar(64) DEFAULT NULL COMMENT '厂家名称',
+ `manufacturerName` varchar(64) DEFAULT NULL COMMENT '厂家编码',
+ `sortNo` int DEFAULT NULL COMMENT '排序',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='厂家';
+
+-- 正在导出表 yxt_wms.wms_manufacturer 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_markuprate_unified 结构
+DROP TABLE IF EXISTS `wms_markuprate_unified`;
+CREATE TABLE IF NOT EXISTS `wms_markuprate_unified` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `level` varchar(64) DEFAULT NULL COMMENT '级别名称(客户)',
+ `price` double(10,2) DEFAULT NULL COMMENT '对应销售价',
+ `markuprate` int DEFAULT NULL COMMENT '加价率',
+ `sortNo` int DEFAULT NULL COMMENT '排序',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='统一加价率';
+
+-- 正在导出表 yxt_wms.wms_markuprate_unified 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_purchaseback_bill 结构
+DROP TABLE IF EXISTS `wms_purchaseback_bill`;
+CREATE TABLE IF NOT EXISTS `wms_purchaseback_bill` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '0正常,1作废',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid(采购单sid)',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '来源单编号',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createDate` varchar(64) DEFAULT NULL COMMENT '单据日期',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '制单人sid',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `backErrorAmount` double(10,2) DEFAULT NULL COMMENT '退误差调整金额',
+ `backDiscountAmount` double(10,2) DEFAULT NULL COMMENT '退优惠金额',
+ `deductDebts` double(10,2) DEFAULT NULL COMMENT '抵扣欠款',
+ `deductBillNo` varchar(64) DEFAULT NULL COMMENT '抵扣单号',
+ `toPrepayment` double(10,2) DEFAULT NULL COMMENT '转入预付款',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='采购退货单据';
+
+-- 正在导出表 yxt_wms.wms_purchaseback_bill 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_purchaseback_detail 结构
+DROP TABLE IF EXISTS `wms_purchaseback_detail`;
+CREATE TABLE IF NOT EXISTS `wms_purchaseback_detail` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `goodsStockSid` varchar(64) DEFAULT NULL COMMENT '商品库存sid',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `specification` varchar(64) DEFAULT NULL COMMENT '规格',
+ `goodsModel` varchar(64) DEFAULT NULL COMMENT '车型',
+ `currentCount` double(10,2) DEFAULT NULL COMMENT '退货后的库存数量',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `position` varchar(64) DEFAULT NULL COMMENT '货位',
+ `returnedCount` double(10,2) DEFAULT NULL COMMENT '已退数量',
+ `backCount` double(10,2) DEFAULT NULL COMMENT '退货数量',
+ `maxAmount` double(10,2) DEFAULT NULL COMMENT '税额',
+ `maxPrice` double(10,2) DEFAULT NULL COMMENT '含税价',
+ `backAmount` double(10,2) DEFAULT NULL COMMENT '退货金额',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='采购退货单据明细';
+
+-- 正在导出表 yxt_wms.wms_purchaseback_detail 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_purchase_bill 结构
+DROP TABLE IF EXISTS `wms_purchase_bill`;
+CREATE TABLE IF NOT EXISTS `wms_purchase_bill` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值 0正常,1作废',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `sourceBillSid` varchar(64) DEFAULT NULL COMMENT '来源单sid(工单sid)',
+ `sourceBillNo` varchar(64) DEFAULT NULL COMMENT '来源单编号',
+ `billNo` varchar(64) DEFAULT NULL COMMENT '单据编号',
+ `createDate` varchar(64) DEFAULT NULL COMMENT '单据日期',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '制单人sid',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '制单人姓名',
+ `purchaseType` varchar(64) DEFAULT NULL COMMENT '采购类型(厂家采购、外采)',
+ `supplierSid` varchar(64) DEFAULT NULL COMMENT '供应商sid',
+ `supplierName` varchar(64) DEFAULT NULL COMMENT '供应商名称',
+ `supplierPhone` varchar(64) DEFAULT NULL COMMENT '供应商联系电话',
+ `billType` varchar(64) DEFAULT NULL COMMENT '票据类型(不含税、增值税、普通税、已含增值税)',
+ `markupType` varchar(64) DEFAULT NULL COMMENT '加价方式(统一加价率、区间加价率、仓库加价率)',
+ `priceStrategy` varchar(64) DEFAULT NULL COMMENT '进价不同时的价格策略(加权平均、分别计价)',
+ `isInvoicing` int DEFAULT NULL COMMENT '是否需要开发票(是1,否0)',
+ `invoiceCode` varchar(64) DEFAULT NULL COMMENT '发票号码',
+ `tempMarkupRate` int DEFAULT NULL COMMENT '临时加价率',
+ `purchaserSid` varchar(64) DEFAULT NULL COMMENT '采购员sid(单选)',
+ `purchaserName` varchar(64) DEFAULT NULL,
+ `storekeeperSid` varchar(64) DEFAULT NULL COMMENT '库管员sid(单选)',
+ `storekeeperName` varchar(64) DEFAULT NULL,
+ `errorAmount` decimal(10,2) DEFAULT NULL COMMENT '误差调整金额',
+ `freight` decimal(10,2) DEFAULT NULL COMMENT '运费',
+ `discountAmount` decimal(10,2) DEFAULT NULL COMMENT '优惠金额',
+ `payableAmount` decimal(10,2) DEFAULT NULL COMMENT '应付金额(=采购金额+运费-优惠金额)',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='采购单';
+
+-- 正在导出表 yxt_wms.wms_purchase_bill 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_purchase_bill_detail 结构
+DROP TABLE IF EXISTS `wms_purchase_bill_detail`;
+CREATE TABLE IF NOT EXISTS `wms_purchase_bill_detail` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '单据sid',
+ `goodsSid` varchar(64) DEFAULT NULL COMMENT '商品sid',
+ `goodsName` varchar(64) DEFAULT NULL COMMENT '商品名称',
+ `goodsCode` varchar(64) DEFAULT NULL COMMENT '商品编码(图号)',
+ `specification` varchar(64) DEFAULT NULL COMMENT '规格',
+ `goodsModel` varchar(64) DEFAULT NULL COMMENT '型号',
+ `currentCount` double(10,2) DEFAULT NULL COMMENT '当前库存数量',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `position` varchar(64) DEFAULT NULL COMMENT '货位',
+ `cost` double(10,2) DEFAULT NULL COMMENT '单位成本(进货价)',
+ `count` double(10,2) DEFAULT NULL COMMENT '采购数量',
+ `taxAmount` double(10,2) DEFAULT NULL COMMENT '税额',
+ `taxPrice` double(10,2) DEFAULT NULL COMMENT '含税价',
+ `amount` double(10,2) DEFAULT NULL COMMENT '采购金额',
+ `price1` double(10,2) DEFAULT NULL COMMENT '销售价1',
+ `price2` double(10,2) DEFAULT NULL COMMENT '销售价2',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='采购单据明细';
+
+-- 正在导出表 yxt_wms.wms_purchase_bill_detail 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_purchase_bill_settle 结构
+DROP TABLE IF EXISTS `wms_purchase_bill_settle`;
+CREATE TABLE IF NOT EXISTS `wms_purchase_bill_settle` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `billSid` varchar(64) DEFAULT NULL COMMENT '采购单sid',
+ `payableAmount` double(10,2) DEFAULT NULL COMMENT '应付金额',
+ `prepaymentdeductAmount` double(10,2) DEFAULT NULL COMMENT '预付款抵扣',
+ `settleKey` varchar(64) DEFAULT NULL COMMENT '结算方式key',
+ `settleValue` varchar(64) DEFAULT NULL COMMENT '结算方式value',
+ `settleAmount` double(10,2) DEFAULT NULL COMMENT '结算金额',
+ `otherSettleKey` varchar(64) DEFAULT NULL COMMENT '其他结算方式',
+ `otherSettleValue` varchar(64) DEFAULT NULL COMMENT '其他结算金额',
+ `debts` double(10,2) DEFAULT NULL COMMENT '欠款金额',
+ `settleTime` datetime DEFAULT NULL COMMENT '结算时间',
+ `createUserSid` varchar(64) DEFAULT NULL COMMENT '结算人sid',
+ `createByName` varchar(64) DEFAULT NULL COMMENT '结算人姓名',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='采购单-结算';
+
+-- 正在导出表 yxt_wms.wms_purchase_bill_settle 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_range_markuprate 结构
+DROP TABLE IF EXISTS `wms_range_markuprate`;
+CREATE TABLE IF NOT EXISTS `wms_range_markuprate` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `range_start` int DEFAULT NULL COMMENT '区间起始',
+ `range_end` int DEFAULT NULL COMMENT '区间截止',
+ `markupRate1` int DEFAULT NULL COMMENT '加价率1',
+ `markupRate2` int DEFAULT NULL COMMENT '加价率2',
+ `markupRate3` int DEFAULT NULL COMMENT '加价率3',
+ `markupRate4` int DEFAULT NULL COMMENT '加价率4',
+ `markupRate5` int DEFAULT NULL COMMENT '加价率5',
+ `sortNo` int DEFAULT NULL COMMENT '排序 ',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='区间加价率';
+
+-- 正在导出表 yxt_wms.wms_range_markuprate 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_supplier 结构
+DROP TABLE IF EXISTS `wms_supplier`;
+CREATE TABLE IF NOT EXISTS `wms_supplier` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `supplierName` varchar(64) DEFAULT NULL COMMENT '供应商名称',
+ `supplierCode` varchar(64) DEFAULT NULL COMMENT '供应商编码(拼音缩写)',
+ `contacts` varchar(64) DEFAULT NULL COMMENT '联系人',
+ `mobile` varchar(64) DEFAULT NULL COMMENT '联系手机号码',
+ `contactAddress` varchar(100) DEFAULT NULL COMMENT '联系地址',
+ `taxpayerNo` varchar(64) DEFAULT NULL COMMENT '税号',
+ `bankName` varchar(64) DEFAULT NULL COMMENT '开户行',
+ `bankAccount` varchar(64) DEFAULT NULL COMMENT '开户行账号',
+ `Address` varchar(100) DEFAULT NULL COMMENT '地址、电话',
+ `billType` varchar(64) DEFAULT NULL COMMENT '票据类型(不含税、增值税、普通税、已含增值税)',
+ `sortNo` int DEFAULT NULL COMMENT '排序号',
+ `initDebts` decimal(10,2) DEFAULT NULL COMMENT '期初欠款',
+ `prepayment` decimal(10,2) DEFAULT NULL COMMENT '预付款',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='供应商';
+
+-- 正在导出表 yxt_wms.wms_supplier 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_warehouse 结构
+DROP TABLE IF EXISTS `wms_warehouse`;
+CREATE TABLE IF NOT EXISTS `wms_warehouse` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `warehouseName` varchar(64) DEFAULT NULL COMMENT '仓库名称',
+ `warehouseCode` varchar(64) DEFAULT NULL COMMENT '仓库编码',
+ `addr` varchar(255) DEFAULT NULL COMMENT '具体地址',
+ `manager` varchar(64) DEFAULT NULL COMMENT '仓库管理员',
+ `markupRate1` int DEFAULT NULL COMMENT '加价率1',
+ `markupRate2` int DEFAULT NULL COMMENT '加价率2',
+ `markupRate3` int DEFAULT NULL COMMENT '加价率3',
+ `markupRate4` int DEFAULT NULL COMMENT '加价率4',
+ `markupRate5` int DEFAULT NULL COMMENT '加价率5',
+ `warehouseType` int DEFAULT NULL COMMENT '仓库类型(0正常库、1旧件库等)',
+ `sortNo` int DEFAULT NULL COMMENT '排序',
+ `useOrgSid` varchar(64) DEFAULT NULL COMMENT '使用组织sid',
+ `createOrgSid` varchar(64) DEFAULT NULL COMMENT '创建组织sid',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='仓库';
+
+-- 正在导出表 yxt_wms.wms_warehouse 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_warehouse_area 结构
+DROP TABLE IF EXISTS `wms_warehouse_area`;
+CREATE TABLE IF NOT EXISTS `wms_warehouse_area` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `areaName` varchar(64) DEFAULT NULL COMMENT '库位名称',
+ `areanCode` varchar(64) DEFAULT NULL COMMENT '库位编码',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid',
+ `volume` double(10,2) DEFAULT NULL COMMENT '库位容量',
+ `unit` varchar(64) DEFAULT NULL COMMENT '计量单位',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库区';
+
+-- 正在导出表 yxt_wms.wms_warehouse_area 的数据:~0 rows (大约)
+
+-- 导出 表 yxt_wms.wms_warehouse_rack 结构
+DROP TABLE IF EXISTS `wms_warehouse_rack`;
+CREATE TABLE IF NOT EXISTS `wms_warehouse_rack` (
+ `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID,唯一编号',
+ `sid` varchar(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
+ `lockVersion` int NOT NULL DEFAULT '0' COMMENT '记录版本,锁',
+ `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
+ `state` int NOT NULL DEFAULT '1' COMMENT '记录状态值',
+ `isEnable` int NOT NULL DEFAULT '1' COMMENT '记录是否可用,1:可用,0:不可用',
+ `isDelete` int NOT NULL DEFAULT '0' COMMENT '记录是否被删除,0:未删除,1:已经删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建者',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '更新者',
+ `rackName` varchar(64) DEFAULT NULL COMMENT '货架名称',
+ `rackCode` varchar(64) DEFAULT NULL COMMENT '货架编码',
+ `warehouseSid` varchar(64) DEFAULT NULL COMMENT '仓库sid ',
+ `locationSid` varchar(64) DEFAULT NULL COMMENT '库位sid ',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='货架';
+
+-- 正在导出表 yxt_wms.wms_warehouse_rack 的数据:~0 rows (大约)
+
+/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */;
+/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
+/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */;
diff --git a/yxt-wms-biz/docs/databases/数据库文档/supervise_supplychain_2024-03-07_01-45-194.xls b/yxt-wms-biz/docs/databases/数据库文档/supervise_supplychain_2024-03-07_01-45-194.xls
new file mode 100644
index 0000000000..05a77471e9
Binary files /dev/null and b/yxt-wms-biz/docs/databases/数据库文档/supervise_supplychain_2024-03-07_01-45-194.xls differ
diff --git a/yxt-wms-biz/docs/databases/数据库文档/仓储管理(yxt_wms)1.1.xlsx b/yxt-wms-biz/docs/databases/数据库文档/仓储管理(yxt_wms)1.1.xlsx
new file mode 100644
index 0000000000..692cb1d637
Binary files /dev/null and b/yxt-wms-biz/docs/databases/数据库文档/仓储管理(yxt_wms)1.1.xlsx differ
diff --git a/yxt-wms-biz/docs/databases/数据库文档/基础信息(yxt_base)1.1.xlsx b/yxt-wms-biz/docs/databases/数据库文档/基础信息(yxt_base)1.1.xlsx
new file mode 100644
index 0000000000..b784ad9805
Binary files /dev/null and b/yxt-wms-biz/docs/databases/数据库文档/基础信息(yxt_base)1.1.xlsx differ
diff --git a/yxt-wms-biz/docs/databases/数据库文档/采购管理(yxt_pms)1.1.xlsx b/yxt-wms-biz/docs/databases/数据库文档/采购管理(yxt_pms)1.1.xlsx
new file mode 100644
index 0000000000..bb508e5af0
Binary files /dev/null and b/yxt-wms-biz/docs/databases/数据库文档/采购管理(yxt_pms)1.1.xlsx differ
diff --git a/yxt-wms-biz/docs/databases/数据库文档/销售管理(yxt_sms)1.1.xlsx b/yxt-wms-biz/docs/databases/数据库文档/销售管理(yxt_sms)1.1.xlsx
new file mode 100644
index 0000000000..ccfd6c79b4
Binary files /dev/null and b/yxt-wms-biz/docs/databases/数据库文档/销售管理(yxt_sms)1.1.xlsx differ
diff --git a/yxt-wms-biz/docs/sheji/wx20240223.txt b/yxt-wms-biz/docs/sheji/wx20240223.txt
new file mode 100644
index 0000000000..14747bf8c8
--- /dev/null
+++ b/yxt-wms-biz/docs/sheji/wx20240223.txt
@@ -0,0 +1,16 @@
+http://39.104.100.138/warehouse/
+admin/111111
+这个是喜相随的库存管理,可以出、入库操作。
+
+
+
+https://modao.cc/proto/CplNgUscs94yg8rssHbhjw/sharing?view_mode=read_only
+
+
+
+
+功能考虑在最外层加上使用者,每个使用者都拥有自己一套独立的仓储系统。
+未来实现:
+1.仓库产权方可以在平台仓库。
+2.使用者选择仓库,并可申请开通云仓系统服务。
+2.根据使用者所使用的功能设置云仓年服务费。
\ No newline at end of file
diff --git a/yxt-wms-biz/docs/sheji/仓储、储运与管线.png b/yxt-wms-biz/docs/sheji/仓储、储运与管线.png
new file mode 100644
index 0000000000..3981ac5e38
Binary files /dev/null and b/yxt-wms-biz/docs/sheji/仓储、储运与管线.png differ
diff --git a/yxt-wms-biz/docs/sheji/仓储功能模块.jpg b/yxt-wms-biz/docs/sheji/仓储功能模块.jpg
new file mode 100644
index 0000000000..01cacfd2c4
Binary files /dev/null and b/yxt-wms-biz/docs/sheji/仓储功能模块.jpg differ
diff --git a/yxt-wms-biz/docs/sheji/仓储建模.png b/yxt-wms-biz/docs/sheji/仓储建模.png
new file mode 100644
index 0000000000..ffeb81cb08
Binary files /dev/null and b/yxt-wms-biz/docs/sheji/仓储建模.png differ
diff --git a/yxt-wms-biz/docs/sheji/仓储管理功能开发计划(2024.02-2024.03).xlsx b/yxt-wms-biz/docs/sheji/仓储管理功能开发计划(2024.02-2024.03).xlsx
new file mode 100644
index 0000000000..c3cecf8e5a
Binary files /dev/null and b/yxt-wms-biz/docs/sheji/仓储管理功能开发计划(2024.02-2024.03).xlsx differ
diff --git a/yxt-wms-biz/docs/sheji/功能权限设计.docx b/yxt-wms-biz/docs/sheji/功能权限设计.docx
new file mode 100644
index 0000000000..ebb4f10ce9
--- /dev/null
+++ b/yxt-wms-biz/docs/sheji/功能权限设计.docx
@@ -0,0 +1,9 @@
+1. PC端功能权限设计
+ (1) 添加功能
+先选择PC端,然后选择模块,选择菜单,录入按钮ID。需要把控制权限的按钮录入,不需要控制权限的不用录入。
+ (2) 功能授权
+ 角色授权时,功能列表要分级显示(模块/菜单/功能),只显示当前角色已经授权菜单下的功能。
+ (3)前端功能权限控制
+ 前端页面功能按钮默认都为显示。前端页面中根据userSid、菜单路由调用后台接口,后台返回当前用户、当前菜单没有授权的功能列表。前端根据功能列表设置功能按钮的隐藏。
+
+2. 移动端功能权限设计
diff --git a/yxt-wms-biz/docs/sheji/售后服务管理(含仓储管理功能)开发计划(2024.02-2024.03).xlsx b/yxt-wms-biz/docs/sheji/售后服务管理(含仓储管理功能)开发计划(2024.02-2024.03).xlsx
new file mode 100644
index 0000000000..4d15febbbc
Binary files /dev/null and b/yxt-wms-biz/docs/sheji/售后服务管理(含仓储管理功能)开发计划(2024.02-2024.03).xlsx differ
diff --git a/yxt-wms-biz/docs/sheji/宇信通PC前端页面设计与开发规范v1.0.2.docx b/yxt-wms-biz/docs/sheji/宇信通PC前端页面设计与开发规范v1.0.2.docx
new file mode 100644
index 0000000000..a955a58864
--- /dev/null
+++ b/yxt-wms-biz/docs/sheji/宇信通PC前端页面设计与开发规范v1.0.2.docx
@@ -0,0 +1,119 @@
+ 宇信通前端页面开发规范
+1.样式表规范
+ font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+ 字号:14px。
+
+ 菜单:行高28px/30px,菜单前需要显示图标。
+ 页面标题:左右边距 0px 上边距 5px 行高50px 字号 20px 加粗 中按钮(带图标)
+ 查询条件:行高42px 字号 16px 控件高32px 中按钮(带图标)
+ 列表:
+列表标题:行高 42px 字号 16px 加粗
+列表标题行:行高40px 字号14px 加粗
+列表内容行:行高40px 字号14px 小按钮(不带图标)
+列表整体左右边距:20px
+ 表单:
+ 表单标题:上下边距30px 字号28px 加粗
+ 表单内容:行高42px 字号16px 控件高36px
+标题右对齐,右边距8px;控件左对齐,左边距8px
+必填项红*放在标题左侧2px。
+ 表单整体左右边距:40px
+
+ 分隔条:行高42px 字号16px 加粗
+列表与表单中其它功能按钮:中按钮(带图标)
+
+2.页面规范
+2.1页面标题
+ 列表页面:若有管理功能,则命名为:XXXX管理;若只是查询功能,则命名为:XXXX。如单位信息管理或单位信息。
+ 新增/编辑页面:新增XXX信息/编辑XXXX信息。
+ 详情页面:XXXX详细信息。
+ 其余类型页面以菜单名或功能名来命名,如XXX导出;XXX打印等。
+2.2页面操作工具条
+各页面(包括列表、添加、编辑、删除等页面)顶部应该有独立成行的"操作工具条",背景为灰色,固定不动(不随页面滚动条滚动)。
+操作工具条中放置操作按钮,如新增、编辑、删除、导出、导入、返回、关闭、下载、打印等。
+不需要勾选列表记录的放在右侧、需要勾选在左侧。(可选)
+按钮规范:
+名称、尺寸和颜色要统一。
+
+整体效果如下:
+
+
+3.列表布局及功能规范
+3.1列表查询条件
+列表上面都应该有一个"查询"区域。从上到下分为三部分,每部分都独立成行。
+第一部分:"隐藏/显示查询条件"的按钮,控制查询条件区域的显示和隐藏。
+第二部分:查询条件区域,分为上下两块,上面为可用的查询条件,下面为"查询"、"重置"、"更多查询"按钮。此区域默认为隐藏。
+
+
+3.2列表标题设置
+每个列表中需要有列表标题,如XXX列表。同时显示分页要素。
+
+3.3列表列头、列宽及内容
+(1)列表列头加粗,居中。列头整体有灰色背景。
+(2)列表的列宽,根据实际显示的内容,设置列宽,该宽的宽,该窄的窄。如果内容太长可以考虑换行(如果内容换行则内容的行高要尽量小)。可考虑列宽可以自由拖动。
+(3)列表中内容对齐原则是,如果内容是固定长度的,如身份证号码、手机号码、姓名等,则居中对齐。若是不定长度的,则左对齐。列表中的内容不加粗。鼠标划过时,对应行背景要变色。
+(4)如果需要有编辑、删除等管理功能,则列表的首列应该为多选框,可以全选,也可以单条选择记录。
+3.4列表分页要素
+列表最底端要有分页要素要齐全。
+
+3.5列表具备的功能
+(1)自由设置列显示隐藏(各用户配置存入数据库)。(可选)
+(2)自由拖动列的位置。(可选)
+(3)点击列头进行排序。
+(4)冻结列头前N列(至少包含选择列、序号列、操作列,其它可根据要求设置),列表内容滚动。
+(5)列宽可以拖动。(可选)
+(6)列表如需要则应具备"导入"、"导出"功能。
+4.表单规范
+ 控件的长度,根据实际内容,该长的长,该窄的窄。
+表单标题列如果带表格边框线则无冒号,如果不带边框线则有冒号
+
+页面表单设计为顶部为固定的操作按钮工具条,下面为表单主要内容,表单设计参考word A4纸的展现方式。如表单内容比较多,需要展示滚动条时,只能滚动表单内容,工具条不能滚动。
+
+5.控件使用规范
+选择型控件:
+可选择内容数量少时(一般在6个以内),可用单选按钮和多选按钮。如性别等。
+可选内容数量较多时,需要使用下拉框,同时下拉宽应具备模糊搜索功能。根据实际需要还应具备多选功能。
+时间和日期控件:
+如果为时间则带时分秒,如果为日期则不带。若为类似开始、截止等时间成对出现,则需要控制后面的时间不能早于前面的时间。日期类型为yyyy-MM-dd,时间类型为:yyyy-MM-dd hh:mm:ss。
+数字类型的控件:
+需要进行数据类型的校验。
+特定格式内容的控件:
+需要进行正则表达式的校验。
+列表控件:
+统一使用table控件。
+新增/编辑/详情页的表单:
+统一使用form控件。
+其他类型控件:
+必填项需要进行非空校验。
+注:所有的控件中的内容与格式,都要经过前端和后端的双重校验。
+控件的样式规范:
+待补充。
+6.前端框架规范
+Vue-element-admin
+要求组件化开发,避免简单的复制粘贴。如列表部分应作为一个独立的组件开发。
+VUE的语法规范:ES6。代码格式要严格按照ES6的规范,该空格的地方空格,不需要分号的地方不要分号,各个标签一定要对齐,至少看着要一行行的代码是工整的。代码编译运行起来,不能在控制台里有错误和警告的提示,如果是连接不到接口服务这类的警告提示可以暂时不考虑,但如果是代码规范上的提示,一定要处理掉。
+样式:less和scss。
+7.功能规范
+(1)修改保存数据的提交按钮,必须要加上防止重复提交
+前端点击按钮后将按钮设置为不可用状态,等后台响应后或有异常再把这个按钮设置为可用。
+后台也有控制。
+(2)删除按钮
+删除时需要二次确认提示。
+其他待完善。
+8.页面设计规范
+1.前端项目需要使用代码生成器生成。
+2.列表页顶部工具栏为通用组件,负责动态显示操作按钮权限。
+3.列表、添加/修改、详情要分成3个vue文件。
+4.列表vue文件中import 其他2个文件。添加/修改、详情页面中各自包含操作按钮与事件,不能写在列表文件中。
+5. 添加/修改、详情页面打开时,以显示和隐藏的组件的方式展示(使用了一个viewstate属性控制组件隐藏和显示),导航栏中不能有页签。只有列表才能有页签。
+9.参数规范
+1.token参数的职责只有2个,一是作为网关有效性验证参数使用;二是单点登录首次跳转业务模块(子系统)时前端获取用户信息时使用(前端需缓存用户信息),不能代替业务接口的业务参数使用(如userSid等)。
+2.除了网关外,其他业务接口中不允许直接使用token。
+
+
+
+
+
+
+
+
+
diff --git a/yxt-wms-biz/docs/sheji/客户管理思路设计.docx b/yxt-wms-biz/docs/sheji/客户管理思路设计.docx
new file mode 100644
index 0000000000..2671d0b0db
--- /dev/null
+++ b/yxt-wms-biz/docs/sheji/客户管理思路设计.docx
@@ -0,0 +1,9 @@
+1. 客户管理规则
+ 潜在客户:同一部门中业务人员的客户不能重复,谁先录入手机号码是谁的客户。不同部门客户允许重复。
+ 潜在客户门店销售部经理可以调配所属的业务专员。业务专员之间也可以自行调配。
+ 成交客户:整个集团内唯一。
+2. 录入规则
+ 客户名称、手机号码为必填项,两个条件满足才能录入到系统中。修改客户信息时,客户名称、手机号码不允许修改。不同的客户名称或手机号码视为不同的客户。
+
+ 具体业务逻辑看流程图:
+
diff --git a/yxt-wms-biz/docs/sheji/数据权限设计.docx b/yxt-wms-biz/docs/sheji/数据权限设计.docx
new file mode 100644
index 0000000000..844b6cce99
--- /dev/null
+++ b/yxt-wms-biz/docs/sheji/数据权限设计.docx
@@ -0,0 +1,20 @@
+数据权限设计:
+1.主要思路
+角色授权菜单时,需要同步授权该菜单的数据权限,设计角色与菜单关联表中增加数据权限ID的字段。数据权限主要分为5个层级:1集团、2事业部、3分公司、4部门、5个人。后续可以考虑增加数据规则,确定数据查询字段及范围。
+以用户最高层级角色对应的数据权限。
+
+2.实现过程
+新创建一个接口,参数为机构管理层级,菜单sid,返回为数据权限ID。
+ (1)根据用户sid获取切换的机构的管理层级,查找层级对应的角色,角色可能为列表,按照角色层级升序排序。
+ (2)遍历角色列表,根据角色sid和菜单sid从角色与菜单关联表中查询数据权限ID,如数据权限ID不为空,则返回数据权限ID。
+ (3)页面中根据数据权限ID和业务条件进行查询。需要注意1-4层级根据orgSidPath查询,个人5的需要根据createBySid查询。
+
+
+
+
+组织的管理层级 (集团1、事业部2、分公司3、部门4),根据层级确定数据查询的范围。
+根据用户切换的机构路径,根据数据规则ID截取管理层级的机构路径后作为查询条件进行数据查询。
+
+
+特殊情况说明:
+1.分公司副总为部门级角色,由于有些分公司实际情况要求只能查看主管部门的数据,因此,分公司副总角色的数据规则只能设置为部门4。查询数据是只能切换机构去看。此时总经办的查不到数据。
diff --git a/yxt-wms-biz/docs/sheji/系统表.png b/yxt-wms-biz/docs/sheji/系统表.png
new file mode 100644
index 0000000000..f091d4e200
Binary files /dev/null and b/yxt-wms-biz/docs/sheji/系统表.png differ
diff --git a/yxt-wms-biz/pom.xml b/yxt-wms-biz/pom.xml
new file mode 100644
index 0000000000..d160d96397
--- /dev/null
+++ b/yxt-wms-biz/pom.xml
@@ -0,0 +1,134 @@
+
+
+
+
+ com.yxt
+ yxt-parent
+ 0.0.1
+
+
+ 4.0.0
+
+ yxt-wms-biz
+ com.yxt.wms
+ 2.0.1
+
+
+
+ com.yxt
+ yxt-common-base
+ 0.0.1
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+
+
+ com.baomidou
+ mybatis-plus-annotation
+
+
+ junit
+ junit
+ compile
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.26
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+ cn.dev33
+ sa-token-spring-boot-starter
+ 1.37.0
+
+
+ cn.hutool
+ hutool-all
+ 5.8.23
+
+
+ cn.hutool
+ hutool-core
+ 5.8.23
+
+
+ com.google.zxing
+ core
+ 3.5.2
+
+
+ com.alibaba
+ easyexcel
+ 3.3.2
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.5.6
+
+
+
+ repackage
+
+
+
+
+
+
+
+ src/main/java
+
+ **/*Mapper.xml
+
+
+
+ src/main/resources
+
+ **/*.*
+
+ false
+
+
+
+
+
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/YxtWmsApplication.java b/yxt-wms-biz/src/main/java/com/yxt/wms/YxtWmsApplication.java
new file mode 100644
index 0000000000..394cb71920
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/YxtWmsApplication.java
@@ -0,0 +1,24 @@
+package com.yxt.wms;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * @author dimengzhe
+ */
+@SpringBootApplication(scanBasePackages = {
+ "com.yxt.wms.config",
+ "com.yxt.common.base.config",
+ "com.yxt.wms"
+})
+// 启用自带定时任务
+@EnableScheduling
+@EnableFeignClients(basePackages = {"com.yxt.*.*"})
+public class YxtWmsApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(YxtWmsApplication.class, args);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/AdminHomeRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/AdminHomeRest.java
new file mode 100644
index 0000000000..c4af8c93cd
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/AdminHomeRest.java
@@ -0,0 +1,16 @@
+package com.yxt.wms.apiadmin;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController("com.yxt.wms.apiadmin.AdminHomeRest")
+@RequestMapping("/apiadmin/home")
+public class AdminHomeRest {
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
new file mode 100644
index 0000000000..370c645bd9
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaRest.java
@@ -0,0 +1,69 @@
+package com.yxt.wms.apiadmin.base;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:53
+ */
+@Api(tags = "库区信息")
+@RestController
+@RequestMapping("/apiadmin/base/wmswarehousearea")
+public class WmsWarehouseAreaRest {
+
+ @Autowired
+ WmsWarehouseAreaService wmsWarehouseAreaService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return wmsWarehouseAreaService.listPage(pq);
+ }
+ @ApiOperation("查询所有的库区")
+ @GetMapping("/listAll")
+ public ResultBean listAll() {
+ return wmsWarehouseAreaService.getAllType();
+ }
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WmsWarehouseAreaDto dto) {
+ return wmsWarehouseAreaService.saveOrUpdate(dto);
+ }
+
+ @ApiOperation("初始化")
+ @GetMapping("/initialization/{sid}")
+ public ResultBean initialization(@PathVariable("sid") String sid) {
+ return wmsWarehouseAreaService.initialization(sid);
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/delete/{sid}")
+ public ResultBean delete(@PathVariable("sid") String sid) {
+ return wmsWarehouseAreaService.delete(sid);
+ }
+
+
+ @ApiOperation("更改可用状态")
+ @GetMapping("/updateIsEnable/{sid}/{isEnable}")
+ public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
+ return wmsWarehouseAreaService.updateIsEnable(sid,isEnable);
+ }
+
+ @ApiOperation("根据仓库sid查询所有库位")
+ @GetMapping("/selectAll")
+ public ResultBean> selectAll(@RequestParam("ckSid") String ckSid){
+ ResultBean rb = ResultBean.fireFail();
+ List vo = wmsWarehouseAreaService.selectAll(ckSid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
new file mode 100644
index 0000000000..e4e13d4a4b
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseAreaTypeRest.java
@@ -0,0 +1,62 @@
+package com.yxt.wms.apiadmin.base;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeDto;
+import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeQuery;
+import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeService;
+import com.yxt.wms.biz.base.wmswarehouseareatype.WmsWarehouseAreaTypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2024/3/18 14:57
+ */
+@Api(tags = "库区类型信息")
+@RestController
+@RequestMapping("/apiadmin/base/wmswarehouseareatype")
+public class WmsWarehouseAreaTypeRest {
+
+ @Autowired
+ WmsWarehouseAreaTypeService wmsWarehouseAreaTypeService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return wmsWarehouseAreaTypeService.listPage(pq);
+ }
+ @ApiOperation("查询所有的")
+ @GetMapping("/listAll")
+ public ResultBean listAll() {
+ return wmsWarehouseAreaTypeService.listAll();
+ }
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WmsWarehouseAreaTypeDto dto) {
+ return wmsWarehouseAreaTypeService.saveOrUpdate(dto);
+ }
+
+ @ApiOperation("初始化")
+ @GetMapping("/initialization/{sid}")
+ public ResultBean initialization(@PathVariable("sid") String sid) {
+ return wmsWarehouseAreaTypeService.initialization(sid);
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/delete/{sid}")
+ public ResultBean delete(@PathVariable("sid") String sid) {
+ return wmsWarehouseAreaTypeService.delete(sid);
+ }
+
+
+ @ApiOperation("更改可用状态")
+ @GetMapping("/updateIsEnable/{sid}/{isEnable}")
+ public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
+ return wmsWarehouseAreaTypeService.updateIsEnable(sid,isEnable);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseExtendRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseExtendRest.java
new file mode 100644
index 0000000000..21e1f75113
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseExtendRest.java
@@ -0,0 +1,39 @@
+package com.yxt.wms.apiadmin.base;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendDto;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendQuery;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendService;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/3/18 10:52
+ */
+public class WmsWarehouseExtendRest {
+
+ @Autowired
+ WmsWarehouseExtendService wmsWarehouseExtendService;
+
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WmsWarehouseExtendDto dto) {
+ return wmsWarehouseExtendService.saveOrUpdate(dto);
+ }
+
+ @ApiOperation("初始化")
+ @GetMapping("/initialization/{sid}")
+ public ResultBean initialization(@PathVariable("sid") String sid) {
+ return wmsWarehouseExtendService.initialization(sid);
+ }
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
new file mode 100644
index 0000000000..aacf482ecd
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java
@@ -0,0 +1,70 @@
+package com.yxt.wms.apiadmin.base;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/27 16:14
+ */
+@Api(tags = "仓库信息")
+@RestController
+@RequestMapping("/apiadmin/base/wmswarehouseinfo")
+public class WmsWarehouseInfoRest {
+
+ @Autowired
+ WmsWarehouseInfoService wmsWarehouseService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return wmsWarehouseService.listPage(pq);
+ }
+ @ApiOperation("查询所有的仓库")
+ @GetMapping("/listAll")
+ public ResultBean listAll() {
+ return wmsWarehouseService.listAll();
+ }
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WmsWarehouseInfoDto dto) {
+ return wmsWarehouseService.saveOrUpdate(dto);
+ }
+
+ @ApiOperation("初始化")
+ @GetMapping("/initialization/{sid}")
+ public ResultBean initialization(@PathVariable("sid") String sid) {
+ return wmsWarehouseService.initialization(sid);
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/delete/{sid}")
+ public ResultBean delete(@PathVariable("sid") String sid) {
+ return wmsWarehouseService.delete(sid);
+ }
+
+
+ @ApiOperation("更改可用状态")
+ @GetMapping("/updateStatus/{sid}/{state}")
+ public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) {
+ return wmsWarehouseService.updateIsEnable(sid,state);
+ }
+
+ @ApiOperation("查询所有仓库")
+ @GetMapping("/selectAll")
+ public ResultBean> selectAll(){
+ ResultBean rb = ResultBean.fireFail();
+ List wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
+ return rb.success().setData(wmsWarehouseAreaAllVos);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
new file mode 100644
index 0000000000..ce59b9bdba
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
@@ -0,0 +1,62 @@
+package com.yxt.wms.apiadmin.base;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackDto;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackQuery;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:59
+ */
+@Api(tags = "货架信息")
+@RestController
+@RequestMapping("/apiadmin/base/wmswarehouserack")
+public class WmsWarehouseRackRest {
+
+ @Autowired
+ WmsWarehouseRackService wmsWarehouseRackService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return wmsWarehouseRackService.listPage(pq);
+ }
+ @ApiOperation("查询所有的库区")
+ @GetMapping("/getAllType")
+ public ResultBean getAllType() {
+ return wmsWarehouseRackService.getAllType();
+ }
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) {
+ return wmsWarehouseRackService.saveOrUpdate(dto);
+ }
+
+ @ApiOperation("初始化")
+ @GetMapping("/initialization/{sid}")
+ public ResultBean initialization(@PathVariable("sid") String sid) {
+ return wmsWarehouseRackService.initialization(sid);
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/delete/{sid}")
+ public ResultBean delete(@PathVariable("sid") String sid) {
+ return wmsWarehouseRackService.delete(sid);
+ }
+
+
+ @ApiOperation("更改可用状态")
+ @GetMapping("/updateIsEnable/{sid}/{isEnable}")
+ public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
+ return wmsWarehouseRackService.updateIsEnable(sid,isEnable);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WarehousingReservationDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WarehousingReservationDetailRest.java
new file mode 100644
index 0000000000..8d9b13dc47
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WarehousingReservationDetailRest.java
@@ -0,0 +1,56 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationDto;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationQuery;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationService;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationVo;
+import com.yxt.wms.biz.inventory.warehousingreservationdetail.WarehousingReservationDetailDto;
+import com.yxt.wms.biz.inventory.warehousingreservationdetail.WarehousingReservationDetailQuery;
+import com.yxt.wms.biz.inventory.warehousingreservationdetail.WarehousingReservationDetailService;
+import com.yxt.wms.biz.inventory.warehousingreservationdetail.WarehousingReservationDetailVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/3/27 14:38
+ */
+@Api(tags = "预约入库明细表")
+@RestController
+@RequestMapping("/apiadmin/inventory/warereservadetail")
+public class WarehousingReservationDetailRest {
+ @Autowired
+ WarehousingReservationDetailService warehousingReservationDetailService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return warehousingReservationDetailService.listPage(pq);
+ }
+
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WarehousingReservationDetailDto dto) {
+ return warehousingReservationDetailService.saveOrUpdate(dto);
+ }
+
+ @ApiOperation("根据预约sid查询明细")
+ @GetMapping("/selByReservationSid/{sid}")
+ public ResultBean> selByReservationSid(@PathVariable("sid") String sid) {
+ return warehousingReservationDetailService.selByReservationSid(sid);
+ }
+
+ @ApiOperation("更改可用状态")
+ @GetMapping("/updateStatus/{sid}/{state}")
+ public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) {
+ return warehousingReservationDetailService.updateIsEnable(sid,state);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WarehousingReservationRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WarehousingReservationRest.java
new file mode 100644
index 0000000000..29e1f0ec39
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WarehousingReservationRest.java
@@ -0,0 +1,55 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationDto;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationQuery;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationService;
+import com.yxt.wms.biz.inventory.warehousingreservation.WarehousingReservationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/27 16:14
+ */
+@Api(tags = "预约入库")
+@RestController
+@RequestMapping("/apiadmin/inventory/warereservation")
+public class WarehousingReservationRest {
+
+ @Autowired
+ WarehousingReservationService warehouseReservationService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ return warehouseReservationService.listPage(pq);
+ }
+
+
+ @ApiOperation("保存修改")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody WarehousingReservationDto dto) {
+ return warehouseReservationService.saveOrUpdate(dto);
+ }
+ @ApiOperation("保存")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WarehousingReservationDto dto) {
+ return warehouseReservationService.save(dto);
+ }
+ @ApiOperation("初始化")
+ @GetMapping("/initialization/{sid}")
+ public ResultBean initialization(@PathVariable("sid") String sid) {
+ return warehouseReservationService.initialization(sid);
+ }
+
+ @ApiOperation("更改可用状态")
+ @GetMapping("/updateStatus/{sid}/{state}")
+ public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) {
+ return warehouseReservationService.updateIsEnable(sid,state);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java
new file mode 100644
index 0000000000..45a3f8cfb3
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsAnsBillRest.java
@@ -0,0 +1,55 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsansbill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/9
+ **/
+@Api(tags = "预期到货通知单")
+@RestController
+@RequestMapping("/apiadmin/WmsAnsBill")
+public class WmsAnsBillRest {
+
+ @Autowired
+ private WmsAnsBillService wmsAnsBillService;
+
+
+ @PostMapping("saveOrUpdate")
+ @ApiOperation("新增修改保存")
+ ResultBean saveOrUpdate(@RequestBody WmsAnsBillDto dto) {
+ return wmsAnsBillService.saveOrUpdateBill(dto);
+ }
+
+ /* @PostMapping("pageList")
+ @ApiOperation("收货单据选择")
+ ResultBean> pageList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsAnsBillService.listPage(pagerQuery);
+ return rb.success().setData(pv);
+ }*/
+
+ @PostMapping("listPage")
+ @ApiOperation("分页列表")
+ ResultBean> listPage(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsAnsBillService.listPages(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @GetMapping("details")
+ @ApiOperation("详情")
+ ResultBean details(@RequestParam("sid") String sid) {
+ return wmsAnsBillService.details(sid);
+ }
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsDistributeBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsDistributeBillRest.java
new file mode 100644
index 0000000000..40db9fc578
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsDistributeBillRest.java
@@ -0,0 +1,56 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsdistributebill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Api(tags = "配货单据")
+@RestController
+@RequestMapping("/apiadmin/WmsDistributeBill")
+public class WmsDistributeBillRest {
+
+ @Autowired
+ private WmsDistributeBillService wmsDistributeBillService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ ResultBean> listPage(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsDistributeBillService.listPage(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("从出库新增配货单")
+ @GetMapping("/getInit")
+ ResultBean getInit(@RequestParam("sid") String sid) {
+ return wmsDistributeBillService.getInit(sid);
+ }
+
+ @ApiOperation("详情/编辑初始化")
+ @GetMapping("/details")
+ ResultBean details(@RequestParam("sid") String sid) {
+ return wmsDistributeBillService.details(sid);
+ }
+
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdateBill")
+ ResultBean saveOrUpdateBill(@RequestBody WmsDistributeBillDto dto) {
+ return wmsDistributeBillService.saveOrUpdateBill(dto);
+ }
+
+ @ApiOperation("确认")
+ @PostMapping("/confirm")
+ ResultBean confirm(@RequestBody WmsDistributeBillDto dto) {
+ return wmsDistributeBillService.confirm(dto);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillDetailRest.java
new file mode 100644
index 0000000000..893a2426b9
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillDetailRest.java
@@ -0,0 +1,49 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-wms(调拨单)
+ * File: WmsInventoryAllocatebillDetailFeignFallback.java
+ * Class: com.yxt.wms.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailRest
+ * Description: (调拨单-明细).
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-25 16:04:08
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "(调拨单-明细)")
+@RestController
+@RequestMapping("v1/wmsinventoryallocatebilldetail")
+public class WmsInventoryAllocatebillDetailRest {
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java
new file mode 100644
index 0000000000..13a36116b9
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventoryallocatebill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-wms(调拨单)
+ * File: WmsInventoryAllocatebillFeignFallback.java
+ * Class: com.yxt.wms.biz.wmsinventoryallocatebill.WmsInventoryAllocatebillRest
+ * Description: (调拨单)-调出方操作.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-25 16:04:08
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "(调拨单)-调出方操作")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventoryallocatebill")
+public class WmsInventoryAllocatebillRest {
+
+ @Autowired
+ private WmsInventoryAllocateBillService wmsInventoryAllocateBillService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryAllocateBillService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryAllocateBillService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryAllocateBillService.delAll(sids);
+ return rb.success();
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("调拨")
+ @PostMapping("/allocation")
+ public ResultBean allocation(@RequestBody WmsInventoryAllocateBillDtoNew dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryAllocateBillService.allocation(dto);
+ return rb.success();
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBatchRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBatchRest.java
new file mode 100644
index 0000000000..611f4bfc1e
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBatchRest.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventorybatch.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-wms(库存)
+ * File: WmsInventoryBatchFeignFallback.java
+ * Class: com.yxt.wms.biz.wmsinventorybatch.WmsInventoryBatchRest
+ * Description: 商品库存-批次属性.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-30 14:05:11
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "商品库存-批次属性")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventorybatch")
+public class WmsInventoryBatchRest {
+
+ @Autowired
+ private WmsInventoryBatchService wmsInventoryBatchService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryBatchService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventoryBatchDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryBatchService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryBatchService.delBySids(sids);
+ return rb.success();
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventoryBatchDetailsVo vo = wmsInventoryBatchService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBillDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBillDetailRest.java
new file mode 100644
index 0000000000..5694c1e091
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBillDetailRest.java
@@ -0,0 +1,17 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2024/3/1 10:34
+ */
+@Api(tags = "出入库单明细")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventorybilldetail")
+public class WmsInventoryBillDetailRest {
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBillRest.java
new file mode 100644
index 0000000000..cc7d82bafe
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryBillRest.java
@@ -0,0 +1,84 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventorybill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/29 11:17
+ */
+@Api(tags = "出入库单据")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventorybill")
+public class WmsInventoryBillRest {
+
+ @Autowired
+ WmsInventoryBillService wmsInventoryBillService;
+ @Autowired
+ HttpServletResponse response;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryBillService.listPage(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("入库单")
+ @PostMapping("/inStorage")
+ public ResultBean inStorage(@RequestBody WmsInventoryBillInDto dto) {
+ return wmsInventoryBillService.inStorage(dto);
+ }
+
+
+ @ApiOperation("出库单")
+ @PostMapping("/outStorage")
+ public ResultBean outStorage(@RequestBody WmsInventoryBillOutDto dto) {
+ return wmsInventoryBillService.outStorage(dto);
+ }
+
+ @ApiOperation("入库单详情")
+ @GetMapping("/details")
+ ResultBean inDetails(@SpringQueryMap InStorageDetailsQuery inStorageDetailsQuery) {
+ return wmsInventoryBillService.inDetails(inStorageDetailsQuery);
+ }
+
+// @ApiOperation("出库单详情")
+// @GetMapping("/outDetails")
+ ResultBean outDetails(@SpringQueryMap OutStorageDetailsQuery outStorageDetailsQuery) {
+ return wmsInventoryBillService.outDetails(outStorageDetailsQuery);
+ }
+
+ @PostMapping("/exportExcel")
+ @ApiOperation(value = "导出")
+ public void exportExcel(@RequestBody WmsInventoryBillQuery query) {
+ //得到所有要导出的数据
+ List exportVoList = wmsInventoryBillService.listExcel(query);
+ //定义导出的excel名字
+ String excelName = "出入库查询";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryBillExcelVo.class, response);
+
+ }
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java
new file mode 100644
index 0000000000..b67e947fe6
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailFeignFallback.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRest
+ * Description: 库存盘点-明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存盘点-明细")
+@RestController
+@RequestMapping("wmsinventorycheckbilldetail")
+public class WmsInventoryCheckbillDetailRest {
+
+ @Autowired
+ private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryCheckbillDetailService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventoryCheckbillDetailDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryCheckbillDetailService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryCheckbillDetailService.delBySids(sids);
+ return rb.success();
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java
new file mode 100644
index 0000000000..49c43f565a
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillFeignFallback.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillRest
+ * Description: 库存盘点.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存盘点")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventorycheckbill")
+public class WmsInventoryCheckbillRest {
+
+ @Autowired
+ private WmsInventoryCheckbillService wmsInventoryCheckbillService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryCheckbillService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryCheckbillService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryCheckbillService.delBySids(sids);
+ return rb.success();
+ }
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventoryCheckbillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("盘点")
+ @PostMapping("/inven")
+ public ResultBean inven(@RequestBody WmsInventoryCheckbillDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryCheckbillService.inven(dto);
+ return rb.success();
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java
new file mode 100644
index 0000000000..3a4f194007
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java
@@ -0,0 +1,168 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryQuery;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo;
+import com.yxt.wms.biz.inventory.wmsinventoryrecord.*;
+import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*;
+import com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * Project: wms(yxt)
+ * File: WmsInventoryRecordFeignFallback.java
+ * Class: inventroy.biz.wmsinventoryrecord.WmsInventoryRecordRest
+ * Description: 库存出入库记录.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-08 17:27:39
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存出入库记录")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventoryrecord")
+public class WmsInventoryRecordRest {
+
+ @Autowired
+ private WmsInventoryRecordService wmsInventoryRecordService;
+
+ @Autowired
+ HttpServletResponse response;
+
+ @ApiOperation("收发存明细报表")
+ @PostMapping("/inventoryDetailsRecord")
+ public ResultBean> inventoryDetailsRecord(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryRecordService.inventoryDetailsRecord(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("库存统计报表")
+ @PostMapping("/inventoryStats")
+ public ResultBean inventoryStats(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventoryCountReportVo vo = wmsInventoryRecordService.inventoryStats(pq);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("入库统计报表详情")
+ @PostMapping("/inventoryInboundStats")
+ public ResultBean> inventoryInboundStats(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryRecordService.inventoryInboundStats(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("出库统计报表详情")
+ @PostMapping("/inventoryOutboundStats")
+ public ResultBean> inventoryOutboundStats(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryRecordService.inventoryOutboundStats(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryRecordService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventoryRecordDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryRecordService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventoryRecordService.delBySids(sids);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventoryRecordDetailsVo vo = wmsInventoryRecordService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("库存出入库记录")
+ @GetMapping("/getWmsInventoryRecordList")
+ ResultBean> getWmsInventoryRecordList(@RequestParam("sid")String sid){
+ return wmsInventoryRecordService.getWmsInventoryRecordList(sid);
+ }
+
+ @ApiOperation("出入库查询")
+ @PostMapping("/pageList")
+ ResultBean> pageList(@RequestBody PagerQuery pagerQuery){
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryRecordService.listPage(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @PostMapping("/exportExcel")
+ @ApiOperation(value = "导出")
+ public void exportExcel(@RequestBody WmsInventoryRecordsQuery query) {
+ //得到所有要导出的数据
+ List exportVoList = wmsInventoryRecordService.listExcel(query);
+ //定义导出的excel名字
+ String excelName = "出入库查询";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryRecordsExcelVo.class, response);
+
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
new file mode 100644
index 0000000000..89c55afd40
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
@@ -0,0 +1,191 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventory.*;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryDto;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryQuery;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 10:51
+ */
+@Api(tags = "库存信息")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventory")
+public class WmsInventoryRest {
+
+ @Autowired
+ WmsInventoryService wmsInventoryService;
+ @Autowired
+ HttpServletResponse response;
+
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryService.listPage(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("删除/批量删除")
+ @DeleteMapping("/delBySids")
+ ResultBean delBySids(@RequestBody String[] sids) {
+ return wmsInventoryService.delAllBySids(sids);
+ }
+
+ // @ApiOperation("入库")
+// @GetMapping("/warehousing")
+ public ResultBean warehousing(WmsInventoryDto dto) {
+ return wmsInventoryService.warehousing(dto);
+ }
+
+ /* @ApiOperation("编辑")
+ @PostMapping("/updateWmsInventory")
+ ResultBean updateWmsInventory(@RequestBody WmsInventoryUpdateDto dto) {
+ return wmsInventoryService.updateWmsInventory(dto);
+ }
+
+ @ApiOperation("新增")
+ @PostMapping("/saveWmsInventory")
+ ResultBean saveWmsInventory(@RequestBody WmsInventorySaveDto dto) {
+ return wmsInventoryService.saveWmsInventory(dto);
+ }*/
+
+
+
+ /*@ApiOperation("初始化")
+ @PostMapping("/init")
+ ResultBean init(@RequestParam("sid") String sid) {
+ return wmsInventoryService.init(sid);
+ }*/
+
+ /* @ApiOperation("批量修改销售价")
+ @PostMapping("/updatePrice")
+ ResultBean updatePrice(@RequestBody WmsInventoryUpdatePrice wmsInventoryUpdatePrice) {
+ return wmsInventoryService.updatePrice(wmsInventoryUpdatePrice);
+ }*/
+
+ /* @ApiOperation("收发存")
+ @PostMapping("/getBillList")
+ ResultBean> getBillList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryService.getBillList(pagerQuery);
+ return rb.success().setData(pv);
+ }*/
+
+ @PostMapping("/exportExcel")
+ @ApiOperation(value = "导出")
+ public void exportExcel(@RequestBody WmsInventoryQuery query) {
+ //得到所有要导出的数据
+ List exportVoList = wmsInventoryService.listExcel(query);
+ //定义导出的excel名字
+ String excelName = "库存列表";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryVoExcelVo.class, response);
+
+ }
+
+ @ApiOperation("修改库存数量")
+ @PostMapping("/updateInventoryCount")
+ ResultBean updateInventoryCount(@RequestBody WmsUpdateCountQuery query) {
+ return wmsInventoryService.updateInventoryCount(query);
+ }
+
+ @ApiOperation("销售开单选择商品分页列表")
+ @PostMapping("/listPageSales")
+ public ResultBean> listPageSales(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryService.listPageSales(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("查询分公司下所有的商品信息")
+ @PostMapping("/getPackageGoodsVo")
+ public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq) {
+ return wmsInventoryService.getPackageGoodsVo(pq);
+ }
+
+ @ApiOperation("库龄查询")
+ @PostMapping("/inventoryAgeList")
+ public ResultBean> inventoryAgeList(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventoryService.inventoryAgeList(pq);
+ return rb.success().setData(pv);
+ }
+
+ @PostMapping("/ageExportExcel")
+ @ApiOperation(value = "库龄查询导出")
+ public void ageExportExcel(@RequestBody WmsInventoryAgeQuery query) {
+ //得到所有要导出的数据
+ List exportVoList = wmsInventoryService.ageExportExcel(query);
+ //定义导出的excel名字
+ String excelName = "库领查询列表";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventoryAgeExportVo.class, response);
+
+ }
+
+ @ApiOperation("根据商品sid查询库存信息")
+ @PostMapping("/selectInvenBySkuSid")
+ public ResultBean selectInvenBySkuSid(@RequestParam("skuSid") String skuSid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsGoodsInventoryVo wmsGoodsInventoryVo = wmsInventoryService.selectInvenBySkuSid(skuSid);
+ return rb.success().setData(wmsGoodsInventoryVo);
+ }
+
+ @ApiOperation("盘库商品分页列表")
+ @PostMapping("/invenGoodsListPage")
+ public ResultBean> invenGoodsListPage(@RequestBody PagerQuery pq) {
+ return wmsInventoryService.invenGoodsListPage(pq);
+ }
+
+ @ApiOperation("调拨商品分页列表")
+ @PostMapping("/alloGoodsListPage")
+ public ResultBean> alloGoodsListPage(@RequestBody PagerQuery pq) {
+ return wmsInventoryService.alloGoodsListPage(pq);
+ }
+
+ @ApiOperation("旧件返厂商品分页列表")
+ @PostMapping("/returnGoodsListPage")
+ public ResultBean> returnGoodsListPage(@RequestBody PagerQuery pq) {
+ return wmsInventoryService.returnGoodsListPage(pq);
+ }
+
+ @ApiOperation("旧件处理商品分页列表")
+ @PostMapping("/handleGoodsListPage")
+ public ResultBean> handleGoodsListPage(@RequestBody PagerQuery pq) {
+ return wmsInventoryService.handleGoodsListPage(pq);
+ }
+
+ @ApiOperation("根据Sid获取库存实体")
+ @PostMapping("/fetchEntityBySid")
+ ResultBean fetchEntityBySid(@RequestParam("sid") String sid) {
+ return wmsInventoryService.fetchEntityBySid(sid);
+ }
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventorySettlebillDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventorySettlebillDetailRest.java
new file mode 100644
index 0000000000..9bc3cf23db
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventorySettlebillDetailRest.java
@@ -0,0 +1,119 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryQuery;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo;
+import com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(yxt-wms)
+ * File: WmsInventorySettlebillDetailFeignFallback.java
+ * Class: wms.biz.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailRest
+ * Description: 库存结算明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 14:22:38
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存结算明细")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventorysettlebilldetail")
+public class WmsInventorySettlebillDetailRest{
+
+ @Autowired
+ private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService;
+ @Autowired
+ HttpServletResponse response;
+
+ @PostMapping("/exportExcel")
+ @ApiOperation(value = "导出")
+ public void exportExcel(@RequestBody WmsInventorySettlebillDetailQuery query) {
+ //得到所有要导出的数据
+ List exportVoList = wmsInventorySettlebillDetailService.listExcel(query);
+ //定义导出的excel名字
+ String excelName = "结转库存列表";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventorySettlebillExportVo.class, response);
+
+ }
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventorySettlebillDetailService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventorySettlebillDetailDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventorySettlebillDetailService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventorySettlebillDetailService.delBySids(sids);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventorySettlebillDetailDetailsVo vo = wmsInventorySettlebillDetailService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventorySettlebillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventorySettlebillRest.java
new file mode 100644
index 0000000000..bae41ac0e4
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventorySettlebillRest.java
@@ -0,0 +1,124 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryQuery;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo;
+import com.yxt.wms.biz.inventory.wmsinventorysettlebill.*;
+import com.yxt.wms.biz.inventory.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(yxt-wms)
+ * File: WmsInventorySettlebillFeignFallback.java
+ * Class: wms.biz.wmsinventorysettlebill.WmsInventorySettlebillRest
+ * Description: 库存结算单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-01 14:22:38
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存结算单")
+@RestController
+@RequestMapping("/apiadmin/inventory/wmsinventorysettlebill")
+public class WmsInventorySettlebillRest {
+
+ @Autowired
+ private WmsInventorySettlebillService wmsInventorySettlebillService;
+ @Autowired
+ private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService;
+
+ @ApiOperation("库存结转")
+ @PostMapping("/saveSettlebill")
+ public ResultBean saveSettlebill(@RequestBody WmsInventorySettlebillDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventorySettlebillService.saveSettlebill(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("结转记录查询")
+ @PostMapping("/carryForwardList")
+ public ResultBean> carryForwardList(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventorySettlebillService.carryForwardList(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = wmsInventorySettlebillService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody WmsInventorySettlebillDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventorySettlebillService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ wmsInventorySettlebillService.delBySids(sids);
+ for (String sid : sids) {
+ wmsInventorySettlebillDetailService.delByMainSid(sid);
+ }
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ WmsInventorySettlebillDetailsVo vo = wmsInventorySettlebillService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java
new file mode 100644
index 0000000000..4576aa69df
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java
@@ -0,0 +1,114 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.base.utils.ExportExcelUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsoldinventory.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/28
+ **/
+@Api(tags = "旧件")
+@RestController
+@RequestMapping("/apiadmin/WmsOldInventory")
+public class WmsOldInventoryRest {
+
+ @Autowired
+ private WmsOldInventoryService wmsOldInventoryService;
+ @Autowired
+ HttpServletResponse response;
+
+ @ApiOperation("待入库旧件列表")
+ @PostMapping("/listPage")
+ ResultBean> listPage(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsOldInventoryService.listPage(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("旧件入库初始化")
+ @GetMapping("/getInit")
+ ResultBean getInit(@RequestParam("sid") String sid) {
+ return wmsOldInventoryService.getInit(sid);
+ }
+
+ @ApiOperation("旧件入库保存")
+ @PostMapping("/saveInventory")
+ ResultBean saveInventory(@RequestBody WmsOldInventoryDto dto) {
+ return wmsOldInventoryService.saveInventory(dto);
+ }
+
+ @ApiOperation("旧件库存查询")
+ @PostMapping("/oldPageList")
+ ResultBean> oldPageList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsOldInventoryService.oldPageList(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("删除/批量删除")
+ @DeleteMapping("/delBySids")
+ ResultBean delBySids(@RequestBody String[] sids) {
+ return wmsOldInventoryService.delAllBySids(sids);
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/excelList")
+ public void excelList(@RequestBody WmsOldInventoryPageListQuery wmsOldInventoryPageListQuery) {
+ //得到所有要导出的数据
+ List exportVoList = wmsOldInventoryService.listExcel(wmsOldInventoryPageListQuery);
+ //定义导出的excel名字
+ String excelName = "旧件库存列表";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsOldInventoryExcelVo.class, response);
+ }
+
+ @ApiOperation("库存出入库记录")
+ @GetMapping("/getDetailsList")
+ ResultBean getDetailsList(@RequestParam("sid") String sid) {
+ return wmsOldInventoryService.getDetailsList(sid);
+ }
+
+ @ApiOperation("旧件出入库记录")
+ @PostMapping("/recordList")
+ ResultBean> recordList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsOldInventoryService.recordList(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("导出")
+ @PostMapping("/excelRecordList")
+ public void excelRecordList(@RequestBody WmsOldInventoryRecordListQuery wmsOldInventoryRecordListQuery) {
+ //得到所有要导出的数据
+ List exportVoList = wmsOldInventoryService.excelRecordList(wmsOldInventoryRecordListQuery);
+ //定义导出的excel名字
+ String excelName = "旧件出入库记录列表";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, WmsOldInventoryRecordListExcelVo.class, response);
+ }
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldRegisterRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldRegisterRest.java
new file mode 100644
index 0000000000..8b208b41b4
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldRegisterRest.java
@@ -0,0 +1,37 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterDto;
+import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterQuery;
+import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterService;
+import com.yxt.wms.biz.inventory.wmsoldregister.WmsOldRegisterVo;
+import com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/26
+ **/
+@Api(tags = "旧件回收登记")
+@RestController
+@RequestMapping("/apiadmin/WmsOldRegister")
+public class WmsOldRegisterRest {
+
+ @Autowired
+ private WmsOldRegisterService wmsOldRegisterService;
+
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveorUpdateOldRegister")
+ ResultBean saveorUpdateOldRegister(@RequestBody WmsOldRegisterDto dto) {
+ return wmsOldRegisterService.saveorUpdateOldRegister(dto);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOutBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOutBillRest.java
new file mode 100644
index 0000000000..e352d59fc1
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOutBillRest.java
@@ -0,0 +1,58 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsoutbill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/24
+ **/
+@Api(tags = "出库单据")
+@RestController
+@RequestMapping("/apiadmin/WmsOutBill")
+public class WmsOutBillRest {
+
+ @Autowired
+ private WmsOutBillService wmsOutBillService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ ResultBean> pageList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsOutBillService.listPage(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("出库保存修改")
+ @PostMapping("/saveOrUpdateOutBill")
+ ResultBean saveOrUpdateOutBill(@RequestBody WmsOutBillDto dto) {
+ return wmsOutBillService.saveOrUpdateOutBill(dto);
+ }
+
+ @ApiOperation("详情")
+ @GetMapping("/details")
+ ResultBean details(@RequestParam("sid") String sid) {
+ return wmsOutBillService.details(sid);
+ }
+
+ @ApiOperation("选择商品分页列表")
+ @PostMapping("/getInventoryList")
+ ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsOutBillService.getInventoryList(pagerQuery);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("确认")
+ @PostMapping("/confirm")
+ ResultBean confirm(@RequestBody WmsOutBillDto dto) {
+ return wmsOutBillService.confirm(dto);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java
new file mode 100644
index 0000000000..12db67ca3f
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsReceiptBillRest.java
@@ -0,0 +1,73 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillQuery;
+import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillVo;
+import com.yxt.wms.biz.inventory.wmsreceiptbill.*;
+import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/3
+ **/
+@Api(tags = "收货单据")
+@RestController
+@RequestMapping("/apiadmin/inventory/WmsReceiptBill")
+public class WmsReceiptBillRest {
+
+ @Autowired
+ private WmsReceiptBillService wmsReceiptBillService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsReceiptBillService.listPage(pq);
+ return rb.success().setData(pv);
+ }
+
+ /* @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdate2")
+ ResultBean saveOrUpdate2(@RequestBody WmsReceiptBillDto dto) {
+ return wmsReceiptBillService.saveOrUpdateBill(dto);
+ }
+ */
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdate")
+ ResultBean saveOrUpdate(@RequestBody WmsReceiptBillDto2 dto) {
+ return wmsReceiptBillService.saveOrUpdateBill2(dto);
+ }
+
+ @ApiOperation("通知单收货单初始化")
+ @GetMapping("/getInitDetails")
+ ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) {
+ return wmsReceiptBillService.getInitDetails(sourceSid);
+ }
+
+ @ApiOperation("收货单据编辑初始化/详情")
+ @GetMapping("/getDetailsInit")
+ ResultBean getDetailsInit(@RequestParam("sid") String sid) {
+ return wmsReceiptBillService.getDetailsInit(sid);
+ }
+
+ @ApiOperation("确认")
+ @PostMapping("/confirm")
+ ResultBean confirm(@RequestBody WmsReceiptBillDto2 dto) {
+ return wmsReceiptBillService.confirm(dto);
+ }
+
+ @ApiOperation("删除/批量删除")
+ @DeleteMapping("/delBySids")
+ ResultBean delBySids(@RequestBody String[] sids) {
+ return wmsReceiptBillService.delAllBySids(sids);
+ }
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
new file mode 100644
index 0000000000..bf63d41f26
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
@@ -0,0 +1,73 @@
+package com.yxt.wms.apiadmin.inventroy;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillDto2;
+import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillPageVo;
+import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery;
+import com.yxt.wms.biz.inventory.wmsshelfbill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/11
+ **/
+@Api(tags = "上货架")
+@RestController
+@RequestMapping("/apiadmin/WmsShelfBill")
+public class WmsShelfBillRest {
+
+ @Autowired
+ private WmsShelfBillService wmsShelfBillService;
+
+ @ApiOperation("分页列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean> rb = ResultBean.fireFail();
+ PagerVo pv = wmsShelfBillService.listPage(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdate")
+ ResultBean saveOrUpdate(@RequestBody WmsShelfBillDto dto) {
+ return wmsShelfBillService.saveOrUpdateShelf(dto);
+ }
+
+ @ApiOperation("删除/批量删除")
+ @DeleteMapping("/delBySids")
+ ResultBean delBySids(@RequestBody String[] sids) {
+ return wmsShelfBillService.delAllBySids(sids);
+ }
+
+ @ApiOperation("详情")
+ @GetMapping("/details")
+ ResultBean details(@RequestParam("sid") String sid) {
+ return wmsShelfBillService.details(sid);
+ }
+
+ /**
+ * 新增初始化
+ *
+ * @param sid 收货单据sid
+ * @return
+ */
+ @ApiOperation("新增初始化")
+ @GetMapping("/getInit")
+ ResultBean getInit(@RequestParam("sid") String sid,@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid) {
+ return wmsShelfBillService.getInit(sid,orgPath,userSid);
+ }
+
+ @ApiOperation("确认")
+ @PostMapping("/confirm")
+ ResultBean confirm(@RequestBody WmsShelfBillDto dto) {
+ return wmsShelfBillService.confirm(dto);
+ }
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiwx/WxHomeRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiwx/WxHomeRest.java
new file mode 100644
index 0000000000..70d00103de
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiwx/WxHomeRest.java
@@ -0,0 +1,16 @@
+package com.yxt.wms.apiwx;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController("com.yxt.wms.apiwx.WxHomeRest")
+@RequestMapping("/apiwx/home")
+public class WxHomeRest {
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java
new file mode 100644
index 0000000000..8518704fab
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java
@@ -0,0 +1,28 @@
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:38
+ */
+@Data
+public class WmsWarehouseArea extends BaseEntity {
+// private String id;
+// private String sid= UUID.randomUUID().toString();
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// private Date createTime;
+// private String remarks;
+// private String isEnable;
+ private String areaName;//库位名称
+ private String areaCode;//库位编码
+ private String warehouseSid;//仓库sid
+ private String volume;//库位容量
+ private String unit;//计量单位
+ private String areaTypeSid;//货区类型
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaAllVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaAllVo.java
new file mode 100644
index 0000000000..f2a58d43b9
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaAllVo.java
@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓库)
+ * File: WmsWarehouseAreaVo.java
+ * Class: com.yxt.wms.api.wmswarehousearea.WmsWarehouseAreaVo
+ * Description: 库区 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库区 视图数据详情", description = "库区 视图数据详情")
+public class WmsWarehouseAreaAllVo implements Vo {
+
+ private String sid;
+ @ApiModelProperty("库位名称")
+ private String areaName;
+ @ApiModelProperty("库位编码")
+ private String areaCode;
+}
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java
new file mode 100644
index 0000000000..21e878c5b4
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaDto.java
@@ -0,0 +1,28 @@
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:38
+ */
+@Data
+public class WmsWarehouseAreaDto implements Dto {
+ private String id;
+ private String sid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ private String remarks;
+ private String isEnable;
+ private String areaName;//库位名称
+ private String areaCode;//库位编码
+ private String warehouseSid;//仓库sid
+ private String volume;//库位容量
+ private String unit;//计量单位
+ private String areaTypeSid;//货区类型
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
new file mode 100644
index 0000000000..e8837df2ec
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java
@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Mapper
+public interface WmsWarehouseAreaMapper extends BaseMapper {
+ IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+ WmsWarehouseAreaVo initialization (@Param("sid") String sid);
+
+ @Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
+ List selectAll(String ckSid);
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
new file mode 100644
index 0000000000..4cdd80de77
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
new file mode 100644
index 0000000000..dc95bb8ee3
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaQuery.java
@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseAreaQuery implements Query {
+ private String name;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
new file mode 100644
index 0000000000..d357cde69d
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java
@@ -0,0 +1,93 @@
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class WmsWarehouseAreaService extends MybatisBaseService {
+
+
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseAreaQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(query.getName())){
+ qw.like("areaName",query.getName());
+ }
+
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.listPage(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ List records = pagging.getRecords();
+ return rb.success().setData(p);
+ }
+ public ResultBean getAllType() {
+ ResultBean rb = ResultBean.fireFail();
+ List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1));
+ return rb.success().setData(pagging);
+ }
+
+ public ResultBean saveOrUpdate(WmsWarehouseAreaDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = "";
+ if (StringUtils.isNotBlank(dto.getSid())) {
+ sid = dto.getSid();
+ WmsWarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
+ wmsWarehouseArea.setModifyTime(new Date());
+ baseMapper.updateById(wmsWarehouseArea);
+ } else {
+ WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea();
+ sid = wmsWarehouseArea.getSid();
+ BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
+ wmsWarehouseArea.setCreateTime(new DateTime());
+ baseMapper.insert(wmsWarehouseArea);
+ }
+ return rb.success().setMsg("成功");
+ }
+
+ public ResultBean initialization(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseAreaVo vo = baseMapper.initialization(sid);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean delete(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);
+ if (null != wmsWarehouseArea) {
+ baseMapper.deleteById(wmsWarehouseArea.getId());
+ }
+ return rb.success();
+ }
+ public ResultBean updateIsEnable(String sid,String isEnable) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);
+ if (null != wmsWarehouseArea) {
+ wmsWarehouseArea.setIsEnable(Integer.parseInt(isEnable));
+ baseMapper.updateById(wmsWarehouseArea);
+ }
+ return rb.success().setMsg("成功");
+ }
+
+ public List selectAll(String ckSid) {
+ return baseMapper.selectAll(ckSid);
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java
new file mode 100644
index 0000000000..daf2d272c4
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaVo.java
@@ -0,0 +1,34 @@
+package com.yxt.wms.biz.base.wmswarehousearea;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseAreaVo implements Vo {
+ private String id;
+ private String sid;
+ private String lockVersion;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date modifyTime;
+ private String remarks;
+ private String isEnable;
+ private String state;
+ private String isDelete;
+ private String areaName;//库位名称
+ private String areaCode;//库位编码
+ private String warehouseSid;//仓库sid
+ private String volume;//库位容量
+ private String unit;//计量单位
+ private String areaTypeSid;//货区类型
+ private String warehouseName;//仓库名称
+ private String areaTypeName;//货区类型名称
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaType.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaType.java
new file mode 100644
index 0000000000..916b8443cf
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaType.java
@@ -0,0 +1,17 @@
+package com.yxt.wms.biz.base.wmswarehouseareatype;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:38
+ */
+@Data
+public class WmsWarehouseAreaType extends BaseEntity {
+
+ private String warehouseAreaTypeName;//库位类型名称
+ private String useOrgSid;//使用组织sid
+ private String createOrgSid;//创建组织sid
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java
new file mode 100644
index 0000000000..c368768fbb
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java
@@ -0,0 +1,25 @@
+package com.yxt.wms.biz.base.wmswarehouseareatype;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:38
+ */
+@Data
+public class WmsWarehouseAreaTypeDto implements Dto {
+ private String id;
+ private String sid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ private String remarks;
+ private String isEnable;
+ private String warehouseAreaTypeName;//库位类型名称
+ private String useOrgSid;//使用组织sid
+ private String createOrgSid;//创建组织sid
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
new file mode 100644
index 0000000000..dff49768f8
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java
@@ -0,0 +1,18 @@
+package com.yxt.wms.biz.base.wmswarehouseareatype;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Mapper
+public interface WmsWarehouseAreaTypeMapper extends BaseMapper {
+ IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+ WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid);
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
new file mode 100644
index 0000000000..c9a6c7995f
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java
new file mode 100644
index 0000000000..203efd4f63
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeQuery.java
@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.base.wmswarehouseareatype;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseAreaTypeQuery implements Query {
+ private String name;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
new file mode 100644
index 0000000000..f8f4d52bf6
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeService.java
@@ -0,0 +1,89 @@
+package com.yxt.wms.biz.base.wmswarehouseareatype;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class WmsWarehouseAreaTypeService extends MybatisBaseService {
+
+
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseAreaTypeQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(query.getName())){
+ qw.like("areaName",query.getName());
+ }
+
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.listPage(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ List records = pagging.getRecords();
+ return rb.success().setData(p);
+ }
+ public ResultBean listAll() {
+ ResultBean rb = ResultBean.fireFail();
+ List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1));
+ return rb.success().setData(pagging);
+ }
+
+ public ResultBean saveOrUpdate(WmsWarehouseAreaTypeDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = "";
+ if (StringUtils.isNotBlank(dto.getSid())) {
+ sid = dto.getSid();
+ WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
+ wmsWarehouseArea.setModifyTime(new Date());
+ baseMapper.updateById(wmsWarehouseArea);
+ } else {
+ WmsWarehouseAreaType wmsWarehouseArea = new WmsWarehouseAreaType();
+ sid = wmsWarehouseArea.getSid();
+ BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
+ wmsWarehouseArea.setCreateTime(new DateTime());
+ baseMapper.insert(wmsWarehouseArea);
+ }
+ return rb.success().setMsg("成功");
+ }
+
+ public ResultBean initialization(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseAreaTypeVo vo = baseMapper.initialization(sid);
+ return rb.success().setData(vo);
+ }
+
+
+ public ResultBean delete(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
+ if (null != wmsWarehouseArea) {
+ baseMapper.deleteById(wmsWarehouseArea.getId());
+ }
+ return rb.success();
+ }
+ public ResultBean updateIsEnable(String sid,String isEnable) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
+ if (null != wmsWarehouseArea) {
+ wmsWarehouseArea.setIsEnable(Integer.parseInt(isEnable));
+ baseMapper.updateById(wmsWarehouseArea);
+ }
+ return rb.success().setMsg("成功");
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java
new file mode 100644
index 0000000000..7909f2213a
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java
@@ -0,0 +1,29 @@
+package com.yxt.wms.biz.base.wmswarehouseareatype;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseAreaTypeVo implements Vo {
+ private String id;
+ private String sid;
+ private String lockVersion;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date modifyTime;
+ private String remarks;
+ private String isEnable;
+ private String state;
+ private String isDelete;
+ private String warehouseAreaTypeName;//库位类型名称
+ private String useOrgSid;//使用组织sid
+ private String createOrgSid;//创建组织sid
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java
new file mode 100644
index 0000000000..2bdcd70163
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java
@@ -0,0 +1,31 @@
+package com.yxt.wms.biz.base.wmswarehouseextend;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:36
+ */
+@Data
+public class WmsWarehouseExtend extends BaseEntity {
+
+ private String warehouseName;//仓库名称
+ private String warehouseCode;//仓库编码
+ private String contacts;//联系人
+ private String mob;//手机
+ private String telephone;//联系电话
+ private String manager;//主管
+ private String areaSid;//地区sid
+ private String address;//地址
+ private String longitude;//经度
+ private String latitude;//纬度
+ private String warehouseTypeKey;//仓库类型Key
+ private String warehouseTypeValue;//仓库类型value
+ private String usageStatus;//使用状态,0停用 1正常
+ private String squareMeter;//平方米
+ private String sortNo;//创建组织sid
+ private String useOrgSid;//创建组织sid
+ private String createOrgSid;//创建组织sid
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendDto.java
new file mode 100644
index 0000000000..fd7d994b7d
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendDto.java
@@ -0,0 +1,36 @@
+package com.yxt.wms.biz.base.wmswarehouseextend;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:38
+ */
+@Data
+public class WmsWarehouseExtendDto implements Dto {
+ private String id;
+ private String sid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ private String remarks;
+ private String isEnable;
+ private String warehouseSid;//仓库sid
+ private String markupRate1;//加价率1
+ private String markupRate2;//加价率2
+ private String markupRate3;//加价率3
+ private String markupRate4;//加价率4
+ private String markupRate5;//加价率5
+
+
+
+
+
+
+
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendMapper.java
new file mode 100644
index 0000000000..981963ccad
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendMapper.java
@@ -0,0 +1,17 @@
+package com.yxt.wms.biz.base.wmswarehouseextend;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Mapper
+public interface WmsWarehouseExtendMapper extends BaseMapper {
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendMapper.xml
new file mode 100644
index 0000000000..052328d163
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendQuery.java
new file mode 100644
index 0000000000..e994faefc4
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendQuery.java
@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.base.wmswarehouseextend;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseExtendQuery implements Query {
+ private String name;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendService.java
new file mode 100644
index 0000000000..23e462d31f
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendService.java
@@ -0,0 +1,64 @@
+package com.yxt.wms.biz.base.wmswarehouseextend;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class WmsWarehouseExtendService extends MybatisBaseService {
+
+
+ public ResultBean saveOrUpdate(WmsWarehouseExtendDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = "";
+// for (WmsWarehouseExtendDto dto : dtos) {
+ if (StringUtils.isNotBlank(dto.getSid())) {
+ sid = dto.getSid();
+ WmsWarehouseExtend wmsWarehouse = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
+ wmsWarehouse.setModifyTime(new Date());
+ baseMapper.updateById(wmsWarehouse);
+ } else {
+ WmsWarehouseExtend wmsWarehouse = new WmsWarehouseExtend();
+ sid = wmsWarehouse.getSid();
+ BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
+ wmsWarehouse.setCreateTime(new DateTime());
+ baseMapper.insert(wmsWarehouse);
+ }
+// }
+
+ return rb.success().setMsg("成功");
+ }
+
+ public ResultBean initialization(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseExtendVo vo = new WmsWarehouseExtendVo();
+ WmsWarehouseExtend wmsWarehouse = fetchBySid(sid);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if (null != wmsWarehouse) {
+ BeanUtil.copyProperties(wmsWarehouse, vo);
+// if (StringUtils.isNotBlank(wmsGoods.getPicUrl())) {
+// vo.setPicUrl(fileUploadComponent.getUrlPrefix() + wmsGoods.getPicUrl());
+// }
+// vo.setCreateTime(sdf.format(lpkGoods.getCreateTime()));
+ }
+ return rb.success().setData(vo);
+ }
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java
new file mode 100644
index 0000000000..6198f59691
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java
@@ -0,0 +1,43 @@
+package com.yxt.wms.biz.base.wmswarehouseextend;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseExtendVo implements Vo {
+ private String id;
+ private String sid;
+ private String lockVersion;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date modifyTime;
+ private String remarks;
+ private String isEnable;
+ private String state;
+ private String isDelete;
+ private String warehouseName;//仓库名称
+ private String warehouseCode;//仓库编码
+ private String contacts;//联系人
+ private String mob;//手机
+ private String telephone;//联系电话
+ private String manager;//主管
+ private String areaSid;//地区sid
+ private String address;//地址
+ private String longitude;//经度
+ private String latitude;//纬度
+ private String warehouseTypeKey;//仓库类型Key
+ private String warehouseTypeValue;//仓库类型value
+ private String usageStatus;//使用状态,0停用 1正常
+ private String squareMeter;//平方米
+ private String sortNo;//创建组织sid
+ private String useOrgSid;//创建组织sid
+ private String createOrgSid;//创建组织sid
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java
new file mode 100644
index 0000000000..0f164290bf
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java
@@ -0,0 +1,41 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:36
+ */
+@Data
+public class WmsWarehouseInfo extends BaseEntity {
+
+ private String warehouseName;//仓库名称
+ private String warehouseCode;//仓库编码
+ private String contacts;//联系人
+ private String mob;//手机
+ private String telephone;//联系电话
+ private String manager;//主管
+ private String areaSid;//地区sid
+ private String address;//地址
+ private String longitude;//经度
+ private String latitude;//纬度
+ private String warehouseTypeKey;//仓库类型Key
+ private String warehouseTypeValue;//仓库类型value
+ private String usageStatus;//使用状态,0停用 1正常
+ private String squareMeter;//平方米
+ private String sortNo;//创建组织sid
+ private String useOrgSid;//创建组织sid
+ private String createOrgSid;//创建组织sid
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoAllVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoAllVo.java
new file mode 100644
index 0000000000..3dce54a932
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoAllVo.java
@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓库)
+ * File: WmsWarehouseInfoVo.java
+ * Class: com.yxt.wms.api.wmswarehouseinfo.WmsWarehouseInfoVo
+ * Description: 仓库 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-09 14:35:56
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "仓库 视图数据详情", description = "仓库 视图数据详情")
+public class WmsWarehouseInfoAllVo implements Vo {
+
+ private String sid;
+ @ApiModelProperty("仓库名称")
+ private String warehouseName;
+}
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java
new file mode 100644
index 0000000000..e976cf2cb5
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java
@@ -0,0 +1,42 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendDto;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:38
+ */
+@Data
+public class WmsWarehouseInfoDto implements Dto {
+ private String id;
+ private String sid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ private String remarks;
+ private String isEnable;
+ private String warehouseName;//仓库名称
+ private String warehouseCode;//仓库编码
+ private String contacts;//联系人
+ private String mob;//手机
+ private String telephone;//联系电话
+ private String manager;//主管
+ private String areaSid;//地区sid
+ private String address;//地址
+ private String longitude;//经度
+ private String latitude;//纬度
+ private String warehouseTypeKey;//仓库类型Key
+ private String warehouseTypeValue;//仓库类型value
+ private String usageStatus;//使用状态,0停用 1正常
+ private String squareMeter;//平方米
+ private String sortNo;//创建组织sid
+ private String useOrgSid;//创建组织sid
+ private String createOrgSid;//创建组织sid
+// private List wmsWarehouseExtendDtos;
+ private WmsWarehouseExtendDto wmsWarehouseExtendDto;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
new file mode 100644
index 0000000000..f702273f52
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java
@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Mapper
+public interface WmsWarehouseInfoMapper extends BaseMapper {
+ IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ @Select("select * from wms_warehouse_info")
+ List selectAll();
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
new file mode 100644
index 0000000000..69e01fe07d
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java
new file mode 100644
index 0000000000..eb0b237654
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java
@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseInfoQuery implements Query {
+ private String name;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
new file mode 100644
index 0000000000..f98021be00
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
@@ -0,0 +1,125 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaAllVo;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtend;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendService;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class WmsWarehouseInfoService extends MybatisBaseService {
+
+ @Autowired
+ WmsWarehouseExtendService wmsWarehouseExtendService;
+
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseInfoQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(query.getName())){
+ qw.like("warehouseName",query.getName());
+ }
+
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.listPage(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ List records = pagging.getRecords();
+ return rb.success().setData(p);
+ }
+ public ResultBean listAll() {
+ ResultBean rb = ResultBean.fireFail();
+ List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1));
+ return rb.success().setData(pagging);
+ }
+
+ public ResultBean saveOrUpdate(WmsWarehouseInfoDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = "";
+ if (StringUtils.isNotBlank(dto.getSid())) {
+ sid = dto.getSid();
+ WmsWarehouseInfo wmsWarehouse = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
+ wmsWarehouse.setModifyTime(new Date());
+ baseMapper.updateById(wmsWarehouse);
+// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
+// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
+// }
+ dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+ wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+ } else {
+ WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo();
+ sid = wmsWarehouse.getSid();
+ BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
+ wmsWarehouse.setCreateTime(new DateTime());
+ baseMapper.insert(wmsWarehouse);
+// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
+// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
+// }
+ dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+ wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+ }
+
+ return rb.success().setMsg("成功");
+ }
+
+ public ResultBean initialization(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseInfoVo vo = new WmsWarehouseInfoVo();
+ WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ BeanUtil.copyProperties(wmsWarehouse, vo);
+ List list=wmsWarehouseExtendService.list(new QueryWrapper().eq("warehouseSid",vo.getSid()));
+ List list1=new ArrayList<>();
+ for (WmsWarehouseExtend wmsWarehouseExtend : list) {
+ WmsWarehouseExtendVo vo1= new WmsWarehouseExtendVo();
+ BeanUtil.copyProperties(wmsWarehouseExtend, vo1);
+ list1.add(vo1);
+ }
+ vo.setWmsWarehouseExtendVos(list1);
+ return rb.success().setData(vo);
+ }
+
+
+
+ public ResultBean delete(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
+ if (null != wmsWarehouse) {
+ baseMapper.deleteById(wmsWarehouse.getId());
+ }
+ return rb.success();
+ }
+ public ResultBean updateIsEnable(String sid,String isEnable) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseInfo wmsWarehouse = fetchBySid(sid);
+ if (null != wmsWarehouse) {
+ wmsWarehouse.setIsEnable(Integer.parseInt(isEnable));
+ baseMapper.updateById(wmsWarehouse);
+ }
+ return rb.success().setMsg("成功");
+ }
+
+ public List selectAll() {
+ return baseMapper.selectAll();
+ }
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java
new file mode 100644
index 0000000000..21a32ef693
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java
@@ -0,0 +1,47 @@
+package com.yxt.wms.biz.base.wmswarehouseinfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendDto;
+import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendVo;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseInfoVo implements Vo {
+ private String id;
+ private String sid;
+ private String lockVersion;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date modifyTime;
+ private String remarks;
+ private String isEnable;
+ private String state;
+ private String isDelete;
+ private String warehouseName;//仓库名称
+ private String warehouseCode;//仓库编码
+ private String contacts;//联系人
+ private String mob;//手机
+ private String telephone;//联系电话
+ private String manager;//主管
+ private String areaSid;//地区sid
+ private String address;//地址
+ private String longitude;//经度
+ private String latitude;//纬度
+ private String warehouseTypeKey;//仓库类型Key
+ private String warehouseTypeValue;//仓库类型value
+ private String usageStatus;//使用状态,0停用 1正常
+ private String squareMeter;//平方米
+ private String sortNo;//创建组织sid
+ private String useOrgSid;//创建组织sid
+ private String createOrgSid;//创建组织sid
+ private List wmsWarehouseExtendVos;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java
new file mode 100644
index 0000000000..1aca44ba12
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java
@@ -0,0 +1,26 @@
+package com.yxt.wms.biz.base.wmswarehouserack;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/28 8:38
+ */
+@Data
+public class WmsWarehouseRack extends BaseEntity {
+// private String id;
+// private String sid= UUID.randomUUID().toString();
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// private Date createTime;
+// private String remarks;
+// private String isEnable;
+ private String rackName;//货架名称
+ private String rackCode;//货架编码
+ private String warehouseSid;//仓库sid
+ private String locationSid;//库位sid
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackDto.java
new file mode 100644
index 0000000000..96edca1e29
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackDto.java
@@ -0,0 +1,25 @@
+package com.yxt.wms.biz.base.wmswarehouserack;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:38
+ */
+@Data
+public class WmsWarehouseRackDto implements Dto {
+ private String id;
+ private String sid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ private String remarks;
+ private String isEnable;
+ private String rackName;//货架名称
+ private String rackCode;//货架编码
+ private String warehouseSid;//仓库sid
+ private String locationSid;//库位sid
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
new file mode 100644
index 0000000000..2755312d82
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.base.wmswarehouserack;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Mapper
+public interface WmsWarehouseRackMapper extends BaseMapper {
+ IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+ WmsWarehouseRackVo initialization (@Param("sid") String sid);
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
new file mode 100644
index 0000000000..13f5fbdd00
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
new file mode 100644
index 0000000000..4ee91bcea1
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackQuery.java
@@ -0,0 +1,13 @@
+package com.yxt.wms.biz.base.wmswarehouserack;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:37
+ */
+@Data
+public class WmsWarehouseRackQuery implements Query {
+ private String name;
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
new file mode 100644
index 0000000000..608cdd68cd
--- /dev/null
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
@@ -0,0 +1,90 @@
+package com.yxt.wms.biz.base.wmswarehouserack;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class WmsWarehouseRackService extends MybatisBaseService {
+
+
+ public ResultBean> listPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ WmsWarehouseRackQuery query = pq.getParams();
+ QueryWrapper