yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改

master
ligaode 1 day ago
parent
1e7d0c846a
commit
c3f3783ba2
30 changed files with 1261 additions and 1234 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java
  2. 8
      yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDto.java
  3. 8
      yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java
  4. 8
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
  5. 8
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
  6. 376
      yxt-wms-biz/docs/databases/tables/create_table_warehouse.sql
  7. 1378
      yxt-wms-biz/docs/databases/数据备份/yxt_wms-20240301091036.sql
  8. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
  9. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
  10. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java
  11. 10
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
  12. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java
  13. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackDto.java
  14. 12
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
  15. 14
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
  16. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java
  17. 6
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml
  18. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillListVo.java
  19. 24
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
  20. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetail.java
  21. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailInDto.java
  22. 4
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailOutDto.java
  23. 56
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml
  24. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml
  25. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java
  26. 12
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
  27. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java
  28. 16
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml
  29. 15
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
  30. 14
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

8
yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java
View File

@ -82,10 +82,10 @@ public class PmsPurchasebackDetailDetailsVo implements Vo {
private String areaSid; // 库区/货位sid private String areaSid; // 库区/货位sid
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseAreaName; // 库区名称 private String warehouseAreaName; // 库区名称
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String rackSid; // 货架sid private String rackSid; // 库位sid
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; // 货架名称 private String warehouseRackName; // 库位名称
@ApiModelProperty("已退数量") @ApiModelProperty("已退数量")
private BigDecimal returnedCount; // 已退数量 private BigDecimal returnedCount; // 已退数量
@ApiModelProperty("退货数量") @ApiModelProperty("退货数量")

8
yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebackbill/PmsPurchasebackDetailDto.java
View File

@ -82,10 +82,10 @@ public class PmsPurchasebackDetailDto implements Dto {
private String areaSid; // 库区/货位sid private String areaSid; // 库区/货位sid
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseAreaName; // 库区名称 private String warehouseAreaName; // 库区名称
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String rackSid; // 货架sid private String rackSid; // 库位sid
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; // 货架名称 private String warehouseRackName; // 库位名称
@ApiModelProperty("已退数量") @ApiModelProperty("已退数量")
private BigDecimal returnedCount; // 已退数量 private BigDecimal returnedCount; // 已退数量
@ApiModelProperty("退货数量") @ApiModelProperty("退货数量")

8
yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDetailDto.java
View File

@ -76,10 +76,10 @@ public class PmsPurchaseBillDetailDto implements Dto {
private String warehouseAreaSid; // 库区/货位sid private String warehouseAreaSid; // 库区/货位sid
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseAreaName; // 库区名称 private String warehouseAreaName; // 库区名称
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String warehouseRackSid; // 货架sid private String warehouseRackSid; // 库位sid
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; // 货架名称 private String warehouseRackName; // 库位名称
@ApiModelProperty("单位成本（进货价）") @ApiModelProperty("单位成本（进货价）")
private BigDecimal cost; // 单位成本（进货价） private BigDecimal cost; // 单位成本（进货价）
@ApiModelProperty("采购数量") @ApiModelProperty("采购数量")

8
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
View File

@ -77,10 +77,10 @@ public class PmsPurchaseBillDetailQuery implements Query {
private String warehouseAreaSid; // 库区/货位sid private String warehouseAreaSid; // 库区/货位sid
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseAreaName; // 库区名称 private String warehouseAreaName; // 库区名称
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String warehouseRackSid; // 货架sid private String warehouseRackSid; // 库位sid
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; // 货架名称 private String warehouseRackName; // 库位名称
@ApiModelProperty("单位成本（进货价）") @ApiModelProperty("单位成本（进货价）")
private BigDecimal cost; // 单位成本（进货价） private BigDecimal cost; // 单位成本（进货价）
@ApiModelProperty("采购数量") @ApiModelProperty("采购数量")

8
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
View File

@ -79,10 +79,10 @@ public class PmsPurchaseBillDetailVo implements Vo {
private String warehouseAreaSid; // 库区/货位sid private String warehouseAreaSid; // 库区/货位sid
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseAreaName; // 库区名称 private String warehouseAreaName; // 库区名称
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String warehouseRackSid; // 货架sid private String warehouseRackSid; // 库位sid
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; // 货架名称 private String warehouseRackName; // 库位名称
@ApiModelProperty("单位成本（进货价）") @ApiModelProperty("单位成本（进货价）")
private BigDecimal cost; // 单位成本（进货价） private BigDecimal cost; // 单位成本（进货价）
@ApiModelProperty("采购数量") @ApiModelProperty("采购数量")

376
yxt-wms-biz/docs/databases/tables/create_table_warehouse.sql
View File

@ -1,18 +1,17 @@
DROP TABLE IF EXISTS wms_inventory;
DROP TABLE IF EXISTS `wms_inventory`; CREATE TABLE wms_inventory
CREATE TABLE `wms_inventory` ( (
`id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
goodsID varchar(64) DEFAULT NULL COMMENT '商品ID（唯一编码，入库时生成）', goodsID varchar(64) DEFAULT NULL COMMENT '商品ID（唯一编码，入库时生成）',
goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid', goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
billSid varchar(64) DEFAULT NULL COMMENT '入库单sid', billSid varchar(64) DEFAULT NULL COMMENT '入库单sid',
@ -36,24 +35,23 @@ lockCount decimal(10,2) DEFAULT NULL COMMENT '锁定数量，计算字段，
sortNo int DEFAULT NULL COMMENT '排序', sortNo int DEFAULT NULL COMMENT '排序',
useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid', useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid', createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='商品库存-台账'; ) ENGINE=InnoDB COMMENT='商品库存-台账';
DROP TABLE IF EXISTS `wms_inventory_bill`; DROP TABLE IF EXISTS wms_inventory_bill;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值0正常,1作废；申请-审批中-完成-作废', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值0正常,1作废；申请-审批中-完成-作废',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) 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', sourceBillSid varchar(64) DEFAULT NULL COMMENT '来源单sid',
billNo varchar(64) DEFAULT NULL COMMENT '单据编号', billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
billType varchar(64) DEFAULT NULL COMMENT '单据类型（入库、出库）', billType varchar(64) DEFAULT NULL COMMENT '单据类型（入库、出库）',
@ -67,23 +65,23 @@ warehouseManager varchar(64) DEFAULT NULL COMMENT '库管操作人',
outTime timestamp DEFAULT NULL COMMENT '实际出库时间', outTime timestamp DEFAULT NULL COMMENT '实际出库时间',
useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid', useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid', createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='出入库单据'; ) ENGINE=InnoDB COMMENT='出入库单据';
DROP TABLE IF EXISTS `wms_inventory_bill_detail`; DROP TABLE IF EXISTS wms_inventory_bill_detail;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) 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', billSid varchar(64) DEFAULT NULL COMMENT '单据sid',
inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid', inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
@ -108,24 +106,23 @@ subjectSid varchar(64) DEFAULT NULL COMMENT '科目sid（出库时）',
subject varchar(64) DEFAULT NULL COMMENT '科目（出库时）', subject varchar(64) DEFAULT NULL COMMENT '科目（出库时）',
operTime timestamp DEFAULT NULL COMMENT '操作时间', operTime timestamp DEFAULT NULL COMMENT '操作时间',
operUserSid varchar(64) DEFAULT NULL COMMENT '操作人', operUserSid varchar(64) DEFAULT NULL COMMENT '操作人',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='单据明细'; ) ENGINE=InnoDB COMMENT='单据明细';
DROP TABLE IF EXISTS `wms_inventory_checkbill`; DROP TABLE IF EXISTS wms_inventory_checkbill;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
billNo varchar(64) DEFAULT NULL COMMENT '单据编号', billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
createDate varchar(64) DEFAULT NULL COMMENT '制单日期', createDate varchar(64) DEFAULT NULL COMMENT '制单日期',
createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid', createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
@ -138,24 +135,23 @@ lossCount decimal(10,2) DEFAULT NULL COMMENT '盘亏数量',
lossAmount decimal(10, 2) DEFAULT NULL COMMENT '盈亏金额', lossAmount decimal(10, 2) DEFAULT NULL COMMENT '盈亏金额',
useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid', useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid', createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='库存盘点'; ) ENGINE=InnoDB COMMENT='库存盘点';
DROP TABLE IF EXISTS `wms_inventory_checkbill_detail`; DROP TABLE IF EXISTS wms_inventory_checkbill_detail;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值状态（0正常、2盘亏、1盘盈）', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值状态（0正常、2盘亏、1盘盈）',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) 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', billSid varchar(64) DEFAULT NULL COMMENT '盘点单sid',
inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid', inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid', goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
@ -172,24 +168,23 @@ realCount decimal(10,2) DEFAULT NULL COMMENT '实盘数量',
profitandlossNumber decimal(10, 2) DEFAULT NULL COMMENT '盈亏数（ |实盘数量-账面数量|）', profitandlossNumber decimal(10, 2) DEFAULT NULL COMMENT '盈亏数（ |实盘数量-账面数量|）',
profitandlossAmount decimal(10, 2) DEFAULT NULL COMMENT '盈亏金额（盈亏数*含税价）', profitandlossAmount decimal(10, 2) DEFAULT NULL COMMENT '盈亏金额（盈亏数*含税价）',
picUrl varchar(1000) DEFAULT NULL COMMENT '现场照片（多张中间用英文逗号分隔）', picUrl varchar(1000) DEFAULT NULL COMMENT '现场照片（多张中间用英文逗号分隔）',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='库存盘点-明细'; ) ENGINE=InnoDB COMMENT='库存盘点-明细';
DROP TABLE IF EXISTS `wms_inventory_allocatebill`; DROP TABLE IF EXISTS wms_inventory_allocatebill;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值状态（未完成0、已完成1）', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值状态（未完成0、已完成1）',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
billNo varchar(64) DEFAULT NULL COMMENT '单据编号', billNo varchar(64) DEFAULT NULL COMMENT '单据编号',
createDate varchar(64) DEFAULT NULL COMMENT '制单日期', createDate varchar(64) DEFAULT NULL COMMENT '制单日期',
createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid', createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
@ -203,24 +198,23 @@ confirmName varchar(64) DEFAULT NULL COMMENT '确认人姓名',
finishTime timestamp DEFAULT NULL COMMENT '完成时间', finishTime timestamp DEFAULT NULL COMMENT '完成时间',
useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid', useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid', createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='(调拨单)-调出方操作'; ) ENGINE=InnoDB COMMENT='(调拨单)-调出方操作';
DROP TABLE IF EXISTS `wms_inventory_allocatebill_detail`; DROP TABLE IF EXISTS wms_inventory_allocatebill_detail;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) 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', billSid varchar(64) DEFAULT NULL COMMENT '盘点单sid',
inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid', inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid', goodsSid varchar(64) DEFAULT NULL COMMENT '商品sid',
@ -239,24 +233,23 @@ inWarehouseSid varchar(64) DEFAULT NULL COMMENT '调入仓库sid',
inWarehouseName varchar(64) DEFAULT NULL COMMENT '调入货位', inWarehouseName varchar(64) DEFAULT NULL COMMENT '调入货位',
count decimal(10, 2) DEFAULT NULL COMMENT '调拨数量', count decimal(10, 2) DEFAULT NULL COMMENT '调拨数量',
amount decimal(10, 2) DEFAULT NULL COMMENT '调拨金额（调拨数量*含税价）', amount decimal(10, 2) DEFAULT NULL COMMENT '调拨金额（调拨数量*含税价）',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='(调拨单-明细)'; ) ENGINE=InnoDB COMMENT='(调拨单-明细)';
DROP TABLE IF EXISTS `wms_inventory_settlebill`; DROP TABLE IF EXISTS wms_inventory_settlebill;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
billNo varchar(64) DEFAULT NULL COMMENT '结算单编号', billNo varchar(64) DEFAULT NULL COMMENT '结算单编号',
createDate varchar(64) DEFAULT NULL COMMENT '制单日期', createDate varchar(64) DEFAULT NULL COMMENT '制单日期',
createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid', createUserSid varchar(64) DEFAULT NULL COMMENT '制单人sid',
@ -267,24 +260,23 @@ settle_startTime timestamp DEFAULT NULL COMMENT '开始时间',
settle_endTime timestamp DEFAULT NULL COMMENT '结束时间', settle_endTime timestamp DEFAULT NULL COMMENT '结束时间',
useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid', useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid', createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
PRIMARY KEY (id) USING BTREE
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB COMMENT='库存结算单'; ) ENGINE=InnoDB COMMENT='库存结算单';
DROP TABLE IF EXISTS `wms_inventory_settlebill_detail`; DROP TABLE IF EXISTS wms_inventory_settlebill_detail;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) 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', billSid varchar(64) DEFAULT NULL COMMENT '结算单sid',
settleType timestamp DEFAULT NULL COMMENT '库存结算类型（1月结 2年结）', settleType timestamp DEFAULT NULL COMMENT '库存结算类型（1月结 2年结）',
inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid', inventorySid varchar(64) DEFAULT NULL COMMENT '商品库存sid',
@ -303,24 +295,25 @@ currentEnter decimal(10,2) DEFAULT NULL COMMENT '本期入库',
currentOut decimal(10, 2) DEFAULT NULL COMMENT '本期出库', currentOut decimal(10, 2) DEFAULT NULL COMMENT '本期出库',
currentCheck decimal(10, 2) DEFAULT NULL COMMENT '本期盘点', currentCheck decimal(10, 2) DEFAULT NULL COMMENT '本期盘点',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (id) USING BTREE
) ENGINE=InnoDB COMMENT='库存结算明细'; ) ENGINE=InnoDB COMMENT='库存结算明细';
DROP TABLE IF EXISTS `base_warehouse`; DROP TABLE IF EXISTS base_warehouse;
CREATE TABLE `base_warehouse` ( CREATE TABLE base_warehouse
`id` INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', (
`sid` VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称', warehouseName varchar(64) DEFAULT NULL COMMENT '仓库名称',
warehouseCode varchar(64) DEFAULT NULL COMMENT '仓库编码', warehouseCode varchar(64) DEFAULT NULL COMMENT '仓库编码',
@ -336,50 +329,51 @@ sortNo int DEFAULT NULL COMMENT '排序',
useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid', useOrgSid varchar(64) DEFAULT NULL COMMENT '使用组织sid',
createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid', createOrgSid varchar(64) DEFAULT NULL COMMENT '创建组织sid',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (id) USING BTREE
) ENGINE=InnoDB COMMENT='仓库'; ) ENGINE=InnoDB COMMENT='仓库';
DROP TABLE IF EXISTS `base_warehouse_area`; DROP TABLE IF EXISTS base_warehouse_area;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
areaName varchar(64) DEFAULT NULL COMMENT '库位名称', areaName varchar(64) DEFAULT NULL COMMENT '库位名称',
areanCode varchar(64) DEFAULT NULL COMMENT '库位编码', areanCode varchar(64) DEFAULT NULL COMMENT '库位编码',
warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid', warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid',
volume double(10,2) DEFAULT NULL COMMENT '库位容量', volume double(10, 2
) DEFAULT NULL COMMENT '库位容量',
unit varchar(64) DEFAULT NULL COMMENT '计量单位', unit varchar(64) DEFAULT NULL COMMENT '计量单位',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (id) USING BTREE
) ENGINE=InnoDB COMMENT='库区'; ) ENGINE=InnoDB COMMENT='库区';
DROP TABLE IF EXISTS `base_warehouse_rack`; DROP TABLE IF EXISTS base_warehouse_rack;
CREATE TABLE `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 '字符型编号', id INT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号',
`lockVersion` INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁', sid VARCHAR(64) NOT NULL DEFAULT '0' COMMENT '字符型编号',
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', lockVersion INT(32) NOT NULL DEFAULT '0' COMMENT '记录版本，锁',
`modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', createTime timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间',
`state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', modifyTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间',
`isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', state INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值',
`isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', isEnable INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用',
`remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', isDelete INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除',
`createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', remarks VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息',
`updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', createBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者',
updateBySid VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者',
rackName varchar(64) DEFAULT NULL COMMENT '货架名称', rackName varchar(64) DEFAULT NULL COMMENT '库位名称',
rackCode varchar(64) DEFAULT NULL COMMENT '货架编码', rackCode varchar(64) DEFAULT NULL COMMENT '库位编码',
warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid ', warehouseSid varchar(64) DEFAULT NULL COMMENT '仓库sid ',
locationSid varchar(64) DEFAULT NULL COMMENT '库位sid ', locationSid varchar(64) DEFAULT NULL COMMENT '库位sid ',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (id) USING BTREE
) ENGINE=InnoDB COMMENT='货架'; ) ENGINE=InnoDB COMMENT='库位';

1378
yxt-wms-biz/docs/databases/数据备份/yxt_wms-20240301091036.sql
View File

File diff suppressed because it is too large

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
View File

@ -15,7 +15,7 @@ import java.util.List;
* @author wangpengfei * @author wangpengfei
* @date 2024/2/28 8:59 * @date 2024/2/28 8:59
*/ */
@Api(tags = "货架信息") @Api(tags = "库位信息")
@RestController @RestController
@RequestMapping("/apiadmin/base/wmswarehouserack") @RequestMapping("/apiadmin/base/wmswarehouserack")
public class WmsWarehouseRackRest { public class WmsWarehouseRackRest {

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
View File

@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
* @author: dimengzhe * @author: dimengzhe
* @date: 2024/4/11 * @date: 2024/4/11
**/ **/
@Api(tags = "上货架") @Api(tags = "上库位")
@RestController @RestController
@RequestMapping("/apiadmin/WmsShelfBill") @RequestMapping("/apiadmin/WmsShelfBill")
public class WmsShelfBillRest { public class WmsShelfBillRest {

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseArea.java
View File

@ -16,7 +16,6 @@ import java.util.UUID;
public class WmsWarehouseArea extends BaseEntity { public class WmsWarehouseArea extends BaseEntity {
private String areaName;//库位名称 private String areaName;//库位名称
private String areaCode;//库位编码 private String areaCode;//库位编码
private String warehouseSid;//仓库sid
private BigDecimal volume;//库位容量 private BigDecimal volume;//库位容量
private String unit;//计量单位 private String unit;//计量单位
private String areaTypeSid;//货区类型 private String areaTypeSid;//货区类型

10
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml
View File

@ -7,11 +7,11 @@
<select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo"> <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo">
select select
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName,z.zoneName, a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName,z.zoneName,
b.warehouseTypeValue,s.`name` as deptName, b.warehouseTypeValue,s.name as deptName,
so.`name` as createOrgName so.name as createOrgName
from wms_warehouse_area a from wms_warehouse_area a
left join wms_warehouse_info b on b.sid=a.warehouseSid
left join wms_warehouse_zone z on z.sid = a.zoneSid left join wms_warehouse_zone z on z.sid = a.zoneSid
left join wms_warehouse_info b on b.sid = z.warehouseSid
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization as s ON b.useOrgSid = s.sid
LEFT JOIN anrui_portal.sys_organization as so ON b.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization as so ON b.createOrgSid = so.sid
@ -28,9 +28,9 @@
b.warehouseTypeKey, b.warehouseTypeKey,
b.warehouseTypeValue b.warehouseTypeValue
from wms_warehouse_area a from wms_warehouse_area a
left join wms_warehouse_info b on b.sid = a.warehouseSid
left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
left join wms_warehouse_zone z on z.sid = a.zoneSid left join wms_warehouse_zone z on z.sid = a.zoneSid
left join wms_warehouse_info b on b.sid = z.warehouseSid
left join wms_warehouse_area_type c on c.sid = a.areaTypeSid
where a.sid = #{sid} where a.sid = #{sid}
</select> </select>
<select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea"> <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea">

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java
View File

@ -20,12 +20,10 @@ public class WmsWarehouseRack extends BaseEntity {
// private Date createTime; // private Date createTime;
// private String remarks; // private String remarks;
// private String isEnable; // private String isEnable;
private String rackName;//货架名称 private String rackName;//库位名称
private String rackCode;//货架编码 private String rackCode;//库位编码
private String warehouseSid;//仓库sid
private String locationSid;//库位sid private String locationSid;//库位sid
private String rackFullCode;//库位全码（仓库编码-库区编码-库位编码） private String rackFullCode;//库位全码（仓库编码-库区编码-库位编码）
@ApiModelProperty("打印次数") @ApiModelProperty("打印次数")
private Integer printCount; private Integer printCount;
private String zoneSid;//区域sid
} }

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackDto.java
View File

@ -18,8 +18,8 @@ public class WmsWarehouseRackDto implements Dto {
private Date createTime; private Date createTime;
private String remarks; private String remarks;
private String isEnable; private String isEnable;
private String rackName;//货架名称 private String rackName;//库位名称
private String rackCode;//货架编码 private String rackCode;//库位编码
private String warehouseSid;//仓库sid private String warehouseSid;//仓库sid
private String locationSid;//库位sid private String locationSid;//库位sid
private String userSid; private String userSid;

12
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
View File

@ -7,12 +7,12 @@
<select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo"> <select id="listPage" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo">
select select
a.*,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName,c.warehouseTypeValue, a.*,b.areaName as locationName ,c.warehouseName as warehouseName,z.zoneName,c.warehouseTypeValue,
s.`name` as deptName, s.name as deptName,
so.`name` as createOrgName so.name as createOrgName
from wms_warehouse_rack a from wms_warehouse_rack a
left join wms_warehouse_area b on b.sid =a.locationSid left join wms_warehouse_area b on b.sid =a.locationSid
left join wms_warehouse_info c on c.sid = a.warehouseSid left join wms_warehouse_zone z on z.sid = b.zoneSid
left join wms_warehouse_zone z on z.sid = a.zoneSid left join wms_warehouse_info c on c.sid = z.warehouseSid
LEFT JOIN anrui_portal.sys_organization as s ON c.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization as s ON c.useOrgSid = s.sid
LEFT JOIN anrui_portal.sys_organization as so ON c.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization as so ON c.createOrgSid = so.sid
<where> <where>
@ -26,8 +26,8 @@
c.warehouseTypeValue c.warehouseTypeValue
from wms_warehouse_rack a from wms_warehouse_rack a
left join wms_warehouse_area b on b.sid =a.locationSid left join wms_warehouse_area b on b.sid =a.locationSid
left join wms_warehouse_info c on c.sid = a.warehouseSid left join wms_warehouse_zone z on z.sid = b.zoneSid
left join wms_warehouse_zone z on z.sid = a.zoneSid left join wms_warehouse_info c on c.sid = z.warehouseSid
where a.sid =#{sid} where a.sid =#{sid}
</select> </select>
<select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack"> <select id="checkForInsert" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack">

14
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
View File

@ -32,6 +32,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRackMapper, WmsWarehouseRack> { public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRackMapper, WmsWarehouseRack> {
@Autowired @Autowired
private SysUserFeign sysUserFeign; private SysUserFeign sysUserFeign;
@Autowired @Autowired
@ -259,11 +260,6 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
info.setWarehouseRackSid(rack.getSid()); info.setWarehouseRackSid(rack.getSid());
info.setWarehouseRackName(rack.getRackName()); info.setWarehouseRackName(rack.getRackName());
info.setWarehouseRackCode(rack.getRackCode()); info.setWarehouseRackCode(rack.getRackCode());
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(rack.getWarehouseSid());
if (null != warehouseInfo) {
info.setWarehouseSid(warehouseInfo.getSid());
info.setWarehouseName(warehouseInfo.getWarehouseName());
}
WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(rack.getLocationSid()); WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(rack.getLocationSid());
if (null != wmsWarehouseArea) { if (null != wmsWarehouseArea) {
info.setWareAreaSid(wmsWarehouseArea.getSid()); info.setWareAreaSid(wmsWarehouseArea.getSid());
@ -273,9 +269,15 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
if (null != wmsWarehouseZone) { if (null != wmsWarehouseZone) {
info.setWarehouseZoneName(wmsWarehouseZone.getZoneName()); info.setWarehouseZoneName(wmsWarehouseZone.getZoneName());
info.setWarehouseZoneSid(wmsWarehouseZone.getSid()); info.setWarehouseZoneSid(wmsWarehouseZone.getSid());
if (StringUtils.isNotBlank(wmsWarehouseZone.getWarehouseSid())) {
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseZone.getWarehouseSid());
if (null != warehouseInfo) {
info.setWarehouseSid(warehouseInfo.getSid());
info.setWarehouseName(warehouseInfo.getWarehouseName());
}
}
} }
} }
} }
} else { } else {
return rb; return rb;

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackVo.java
View File

@ -23,8 +23,8 @@ public class WmsWarehouseRackVo implements Vo {
private String isEnable; private String isEnable;
private String state; private String state;
private String isDelete; private String isDelete;
private String rackName;//货架名称 private String rackName;//库位名称
private String rackCode;//货架编码 private String rackCode;//库位编码
private String warehouseSid;//仓库sid private String warehouseSid;//仓库sid
private String locationSid;//库位sid private String locationSid;//库位sid
private String warehouseName;//仓库名称 private String warehouseName;//仓库名称

6
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml
View File

@ -54,9 +54,9 @@
i.useOrgSid i.useOrgSid
FROM FROM
wms_warehouse_rack AS r wms_warehouse_rack AS r
LEFT JOIN wms_warehouse_info AS i ON r.warehouseSid = i.sid left join wms_warehouse_area ar on ar.sid = r.locationSid
LEFT JOIN wms_warehouse_area as ar ON r.locationSid = ar.sid left join wms_warehouse_zone z on z.sid = ar.zoneSid
LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid left join wms_warehouse_info i on i.sid = z.warehouseSid
) AS a ) AS a
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryBillListVo.java
View File

@ -25,7 +25,7 @@ public class WmsInventoryBillListVo {
//库区名称 //库区名称
private String warehouseArea; private String warehouseArea;
//货架名称 //库位名称
private String warehouseRackName; private String warehouseRackName;
//业务类型 //业务类型
private String busTypeValue; private String busTypeValue;

24
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
View File

@ -28,8 +28,8 @@
LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization as s ON a.useOrgSid = s.sid
LEFT JOIN wms_warehouse_rack as wr ON a.warehouseRackSid = wr.sid LEFT JOIN wms_warehouse_rack as wr ON a.warehouseRackSid = wr.sid
LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid
LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid LEFT JOIN wms_warehouse_zone as wz ON wa.zoneSid = wz.sid
LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid LEFT JOIN wms_warehouse_info as i ON wz.warehouseSid = i.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -296,9 +296,9 @@
LEFT JOIN wms_warehouse_area wa LEFT JOIN wms_warehouse_area wa
ON wr.locationSid = wa.sid ON wr.locationSid = wa.sid
LEFT JOIN wms_warehouse_zone wz LEFT JOIN wms_warehouse_zone wz
ON wz.warehouseSid = wi.warehouseSid ON wa.zoneSid = wz.sid
LEFT JOIN wms_warehouse_info wwi LEFT JOIN wms_warehouse_info wwi
ON wwi.sid = wi.warehouseSid ON wwi.sid = wz.warehouseSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -403,10 +403,10 @@
CONCAT(z.zoneName, '-', a.areaName,' ',r.rackCode) houseInfo, CONCAT(z.zoneName, '-', a.areaName,' ',r.rackCode) houseInfo,
i.warehouseName store i.warehouseName store
FROM wms_inventory AS wi FROM wms_inventory AS wi
LEFT JOIN wms_warehouse_info AS i ON wi.warehouseSid = i.sid
LEFT JOIN wms_warehouse_rack AS r ON wi.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack AS r ON wi.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
LEFT JOIN wms_warehouse_zone AS z ON r.zoneSid = z.sid LEFT JOIN wms_warehouse_zone AS z ON a.zoneSid = z.sid
LEFT JOIN wms_warehouse_info AS i ON z.warehouseSid = i.sid
WHERE wi.goodsID = #{goodsID} WHERE wi.goodsID = #{goodsID}
</select> </select>
@ -480,8 +480,8 @@
wms_inventory as wi wms_inventory as wi
LEFT JOIN wms_warehouse_rack as wr ON wi.warehouseRackSid = wr.sid LEFT JOIN wms_warehouse_rack as wr ON wi.warehouseRackSid = wr.sid
LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid
LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid LEFT JOIN wms_warehouse_zone as wz ON wa.zoneSid = wz.sid
LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid LEFT JOIN wms_warehouse_info as i ON wz.warehouseSid = i.sid
LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid LEFT JOIN anrui_portal.sys_organization as so ON wi.createOrgSid = so.sid
LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseRackSid,wi.goodsSkuCode,wi.supplierName) as a GROUP BY wi.createOrgSid,wi.useOrgSid,wi.warehouseRackSid,wi.goodsSkuCode,wi.supplierName) as a
@ -507,8 +507,8 @@
wms_inventory AS i wms_inventory AS i
LEFT JOIN wms_warehouse_rack as r ON i.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack as r ON i.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area as a ON r.locationSid = a.sid LEFT JOIN wms_warehouse_area as a ON r.locationSid = a.sid
LEFT JOIN wms_warehouse_info as wi ON wi.sid = i.warehouseSid LEFT JOIN wms_warehouse_zone as z ON z.sid = a.zoneSid
LEFT JOIN wms_warehouse_zone as z ON z.sid = r.zoneSid LEFT JOIN wms_warehouse_info as wi ON wi.sid = z.warehouseSid
LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
@ -561,8 +561,8 @@
wms_inventory AS i wms_inventory AS i
LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid LEFT JOIN wms_warehouse_zone AS z ON z.sid = a.zoneSid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid LEFT JOIN wms_warehouse_info AS w ON z.warehouseSid = w.sid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库' where w.warehouseTypeValue = '旧件库'
) e) a ) e) a

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetail.java
View File

@ -61,9 +61,9 @@ public class WmsInventoryBillDetail extends BaseEntity {
private String warehouseAreaSid; private String warehouseAreaSid;
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseArea; private String warehouseArea;
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String warehouseRackSid; private String warehouseRackSid;
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; private String warehouseRackName;
@ApiModelProperty("单位成本（进货价）") @ApiModelProperty("单位成本（进货价）")
private BigDecimal cost; private BigDecimal cost;

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailInDto.java
View File

@ -36,8 +36,8 @@ public class WmsInventoryBillDetailInDto {
private String warehouseAreaSid; private String warehouseAreaSid;
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseArea; private String warehouseArea;
private String warehouseRackSid;//货架sid private String warehouseRackSid;//库位sid
private String warehouseRackName;//货架名称 private String warehouseRackName;//库位名称
private String cost;//单位成本（进货价） private String cost;//单位成本（进货价）
private String count;//数量（出库为负） private String count;//数量（出库为负）
private String taxAmount;//税额（出库为负） private String taxAmount;//税额（出库为负）

4
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorybilldetail/WmsInventoryBillDetailOutDto.java
View File

@ -35,9 +35,9 @@ public class WmsInventoryBillDetailOutDto {
private String warehouseAreaSid; private String warehouseAreaSid;
@ApiModelProperty("库区名称") @ApiModelProperty("库区名称")
private String warehouseArea; private String warehouseArea;
@ApiModelProperty("货架sid") @ApiModelProperty("库位sid")
private String warehouseRackSid; private String warehouseRackSid;
@ApiModelProperty("货架名称") @ApiModelProperty("库位名称")
private String warehouseRackName; private String warehouseRackName;
@ApiModelProperty("单位成本（进货价）") @ApiModelProperty("单位成本（进货价）")
private String cost; private String cost;

56
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml
View File

@ -69,8 +69,12 @@
SUM(d.lossCount * d.cost) AS lossAmount SUM(d.lossCount * d.cost) AS lossAmount
FROM FROM
wms_inventory_checkbill_detail d wms_inventory_checkbill_detail d
LEFT JOIN wms_warehouse_rack r
ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z LEFT JOIN wms_warehouse_zone z
ON d.warehouseSid = z.warehouseSid ON z.sid = b.zoneSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -124,8 +128,12 @@
d.remarks d.remarks
FROM FROM
wms_inventory_checkbill_detail d wms_inventory_checkbill_detail d
LEFT JOIN wms_warehouse_rack r
ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z LEFT JOIN wms_warehouse_zone z
ON d.warehouseSid = z.warehouseSid ON z.sid = b.zoneSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -180,8 +188,12 @@
d.remarks d.remarks
FROM FROM
wms_inventory_checkbill_detail d wms_inventory_checkbill_detail d
LEFT JOIN wms_warehouse_rack r
ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z LEFT JOIN wms_warehouse_zone z
ON d.warehouseSid = z.warehouseSid ON z.sid = b.zoneSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -250,10 +262,14 @@
SUM(realCount) AS actualNumber SUM(realCount) AS actualNumber
FROM FROM
wms_inventory_checkbill_detail d wms_inventory_checkbill_detail d
LEFT JOIN wms_warehouse_rack r ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_zone z on z.sid = r.zoneSid
LEFT JOIN wms_inventory_checkbill c LEFT JOIN wms_inventory_checkbill c
ON d.billSid = c.sid ON d.billSid = c.sid
LEFT JOIN wms_warehouse_rack r
ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z
ON z.sid = b.zoneSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -292,11 +308,8 @@
</select> </select>
<select id="getToDoNum" resultType="java.lang.Integer"> <select id="getToDoNum" resultType="java.lang.Integer">
SELECT SELECT COUNT(1)
COUNT(1) FROM (SELECT c.sid,
FROM
(SELECT
c.sid,
d.warehouseRackSid AS houseSid, d.warehouseRackSid AS houseSid,
CONCAT( CONCAT(
d.warehouseName, d.warehouseName,
@ -313,14 +326,15 @@
SUM(lossCount) AS damageNumber, SUM(lossCount) AS damageNumber,
SUM(profitCount) AS profitNumber, SUM(profitCount) AS profitNumber,
SUM(realCount) AS actualNumber SUM(realCount) AS actualNumber
FROM FROM wms_inventory_checkbill_detail d
wms_inventory_checkbill_detail d LEFT JOIN wms_inventory_checkbill c
ON d.billSid = c.sid
LEFT JOIN wms_warehouse_rack r LEFT JOIN wms_warehouse_rack r
ON d.warehouseRackSid = r.sid ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z LEFT JOIN wms_warehouse_zone z
ON z.sid = r.zoneSid ON z.sid = b.zoneSid
LEFT JOIN wms_inventory_checkbill c
ON d.billSid = c.sid
WHERE ( WHERE (
c.createBySid = #{userSid} c.createBySid = #{userSid}
AND c.checkState = 1 AND c.checkState = 1
@ -331,8 +345,7 @@
<select id="excelList" <select id="excelList"
resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodExcel"> resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodExcel">
SELECT SELECT d.goodsID,
d.goodsID,
d.goodsSkuTitle, d.goodsSkuTitle,
d.goodsSkuCode, d.goodsSkuCode,
d.warehouseName, d.warehouseName,
@ -374,10 +387,13 @@
d.lossCount, d.lossCount,
d.lossCount * cost AS lossAmount, d.lossCount * cost AS lossAmount,
d.remarks d.remarks
FROM FROM wms_inventory_checkbill_detail d
wms_inventory_checkbill_detail d LEFT JOIN wms_warehouse_rack r
ON d.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z LEFT JOIN wms_warehouse_zone z
ON d.warehouseSid = z.warehouseSid ON z.sid = b.zoneSid
WHERE d.billSid = #{sid} WHERE d.billSid = #{sid}
</select> </select>
</mapper> </mapper>

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml
View File

@ -71,8 +71,12 @@
IFNULL(SUM(lossCount), 0) AS psNum, IFNULL(SUM(lossCount), 0) AS psNum,
IFNULL(SUM(lossCount * cost), 0) AS psMoney IFNULL(SUM(lossCount * cost), 0) AS psMoney
FROM wms_inventory_checkbill_detail AS wicd FROM wms_inventory_checkbill_detail AS wicd
LEFT JOIN wms_warehouse_zone AS wz LEFT JOIN wms_warehouse_rack r
ON wz.warehouseSid = wicd.warehouseSid ON wicd.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area b
ON b.sid = r.locationSid
LEFT JOIN wms_warehouse_zone z
ON z.sid = b.zoneSid
WHERE wicd.billSid = #{billSid} WHERE wicd.billSid = #{billSid}
GROUP BY wicd.warehouseAreaSid GROUP BY wicd.warehouseAreaSid
</select> </select>

7
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java
View File

@ -33,6 +33,8 @@ import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone;
import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneService;
import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendix; import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendix;
import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService; import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService;
import com.yxt.wms.biz.inventory.wmsappendix.WmsFileEnum; import com.yxt.wms.biz.inventory.wmsappendix.WmsFileEnum;
@ -63,6 +65,8 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
@Autowired @Autowired
private WmsWarehouseAreaService wmsWarehouseAreaService; private WmsWarehouseAreaService wmsWarehouseAreaService;
@Autowired @Autowired
private WmsWarehouseZoneService wmsWarehouseZoneService;
@Autowired
private WmsWarehouseInfoService wmsWarehouseInfoService; private WmsWarehouseInfoService wmsWarehouseInfoService;
public void insertByDto(WmsInventoryCheckbillDetailDto dto) { public void insertByDto(WmsInventoryCheckbillDetailDto dto) {
@ -141,7 +145,8 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
wmsInventoryCheckbillDetail.setUnit(dto.getUnit()); wmsInventoryCheckbillDetail.setUnit(dto.getUnit());
WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(dto.getHouseSid()); WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(dto.getHouseSid());
WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid()); WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
WmsWarehouseInfo wmsWarehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseArea.getWarehouseSid()); WmsWarehouseZone wmsWarehouseZone = wmsWarehouseZoneService.fetchBySid(wmsWarehouseArea.getZoneSid());
WmsWarehouseInfo wmsWarehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseZone.getWarehouseSid());
wmsInventoryCheckbillDetail.setWarehouseSid(wmsWarehouseInfo.getSid()); wmsInventoryCheckbillDetail.setWarehouseSid(wmsWarehouseInfo.getSid());
wmsInventoryCheckbillDetail.setWarehouseName(wmsWarehouseInfo.getWarehouseName()); wmsInventoryCheckbillDetail.setWarehouseName(wmsWarehouseInfo.getWarehouseName());
wmsInventoryCheckbillDetail.setWarehouseAreaSid(wmsWarehouseArea.getSid()); wmsInventoryCheckbillDetail.setWarehouseAreaSid(wmsWarehouseArea.getSid());

12
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml
View File

@ -31,7 +31,7 @@
</select> </select>
<select id="selInboundAndOutboundCount" <select id="selInboundAndOutboundCount"
resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInAndOutboundVo"> resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInAndOutboundVo">
SELECT IFNULL(SUM(r.count), 0) as `count`, SELECT IFNULL(SUM(r.count), 0) as count,
r.billType r.billType
FROM wms_inventory_record AS r FROM wms_inventory_record AS r
<where> <where>
@ -40,7 +40,7 @@
</select> </select>
<select id="inventoryInboundAndOutboundStats" <select id="inventoryInboundAndOutboundStats"
resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInventoryCountDetailsVo"> resultType="com.yxt.wms.biz.inventory.wmsinventoryrecord.report.WmsInventoryCountDetailsVo">
SELECT IFNULL(SUM(r.count), 0) AS `count`, SELECT IFNULL(SUM(r.count), 0) AS count,
r.busTypeValue r.busTypeValue
FROM wms_inventory_record AS r FROM wms_inventory_record AS r
<where> <where>
@ -113,13 +113,13 @@
wir.amount, wir.amount,
wir.tax, wir.tax,
wir.guidPrice, wir.guidPrice,
ui.`name` createByName ui.name createByName
from wms_inventory_record wir from wms_inventory_record wir
LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid
LEFT JOIN wms_warehouse_rack as wr ON wir.warehouseRackSid = wr.sid LEFT JOIN wms_warehouse_rack as wr ON wir.warehouseRackSid = wr.sid
LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid LEFT JOIN wms_warehouse_area as wa ON wr.locationSid = wa.sid
LEFT JOIN wms_warehouse_zone as wz ON wr.zoneSid = wz.sid LEFT JOIN wms_warehouse_zone as wz ON wa.zoneSid = wz.sid
LEFT JOIN wms_warehouse_info as i ON wr.warehouseSid = i.sid LEFT JOIN wms_warehouse_info as i ON wz.warehouseSid = i.sid
LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization as s ON wi.useOrgSid = s.sid
LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid LEFT JOIN anrui_portal.sys_user as u ON wir.createBySid = u.sid
LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid LEFT JOIN anrui_portal.sys_staffinfo as ui ON u.staffSid = ui.sid
@ -151,7 +151,7 @@
wir.amount, wir.amount,
wir.tax, wir.tax,
wir.guidPrice, wir.guidPrice,
ui.`name` createByName, ui.name createByName,
(@rank := @rank + 1) rankNo (@rank := @rank + 1) rankNo
from wms_inventory_record wir from wms_inventory_record wir
LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid LEFT JOIN wms_inventory as wi ON wir.inventorySid = wi.sid

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorysettlebilldetail/WmsInventorySettlebillExportVo.java
View File

@ -28,7 +28,7 @@ public class WmsInventorySettlebillExportVo {
@ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName") @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName")
private String warehouseName;//仓库名称 private String warehouseName;//仓库名称
@ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode") @ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode")
private String warehouseRackCode;//货架名称 private String warehouseRackCode;//库位名称
@ExportEntityMap(CnName = "上期结存", EnName = "preBalance") @ExportEntityMap(CnName = "上期结存", EnName = "preBalance")
private String preBalance; // 上期结存 private String preBalance; // 上期结存
@ExportEntityMap(CnName = "本期结存", EnName = "currentBalance") @ExportEntityMap(CnName = "本期结存", EnName = "currentBalance")

16
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml
View File

@ -99,8 +99,8 @@
wms_inventory AS i wms_inventory AS i
LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid LEFT JOIN wms_warehouse_zone AS z ON z.sid = a.zoneSid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid LEFT JOIN wms_warehouse_info AS w ON z.warehouseSid = w.sid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库' where w.warehouseTypeValue = '旧件库'
ORDER BY i.createTime DESC ORDER BY i.createTime DESC
@ -166,8 +166,8 @@
wms_inventory AS i wms_inventory AS i
LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid
LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid LEFT JOIN wms_warehouse_zone AS z ON z.sid = a.zoneSid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid LEFT JOIN wms_warehouse_info AS w ON z.warehouseSid = w.sid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库' where w.warehouseTypeValue = '旧件库'
ORDER BY i.createTime DESC ORDER BY i.createTime DESC
@ -233,8 +233,8 @@
LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
LEFT JOIN wms_warehouse_info AS w ON r.warehouseSid = w.sid LEFT JOIN wms_warehouse_zone AS z ON z.sid = wa.zoneSid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid LEFT JOIN wms_warehouse_info AS w ON z.warehouseSid = w.sid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库' where w.warehouseTypeValue = '旧件库'
ORDER BY wir.createTime DESC ORDER BY wir.createTime DESC
@ -286,8 +286,8 @@
LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid LEFT JOIN wms_inventory i ON wir.inventorySid = i.sid
LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid LEFT JOIN wms_warehouse_rack AS r ON wir.warehouseRackSid = r.sid
LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid LEFT JOIN wms_warehouse_area AS wa ON r.locationSid = wa.sid
LEFT JOIN wms_warehouse_info AS w ON r.warehouseSid = w.sid LEFT JOIN wms_warehouse_zone AS z ON z.sid = wa.zoneSid
LEFT JOIN wms_warehouse_zone AS z ON z.sid = r.zoneSid LEFT JOIN wms_warehouse_info AS w ON z.warehouseSid = w.sid
LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid
where w.warehouseTypeValue = '旧件库' where w.warehouseTypeValue = '旧件库'
ORDER BY wir.createTime DESC ORDER BY wir.createTime DESC

15
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
View File

@ -11,10 +11,14 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZone;
import com.yxt.wms.biz.base.wmswarehousezone.WmsWarehouseZoneService;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
@ -69,10 +73,13 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
@Autowired @Autowired
private WmsWarehouseRackService wmsWarehouseRackService; private WmsWarehouseRackService wmsWarehouseRackService;
@Autowired @Autowired
private AsBusrepairBillFeign asBusrepairBillFeign; private WmsWarehouseAreaService wmsWarehouseAreaService;
@Autowired
private WmsWarehouseZoneService wmsWarehouseZoneService;
@Autowired @Autowired
private WmsWarehouseInfoService wmsWarehouseInfoService; private WmsWarehouseInfoService wmsWarehouseInfoService;
@Autowired
private AsBusrepairBillFeign asBusrepairBillFeign;
public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) { public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
WmsOldInventoryQuery query = pagerQuery.getParams(); WmsOldInventoryQuery query = pagerQuery.getParams();
@ -599,7 +606,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData(); AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData();
WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode()); WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid()); String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid());
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseRack.getWarehouseSid()); WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
WmsWarehouseZone wmsWarehouseZone = wmsWarehouseZoneService.fetchBySid(wmsWarehouseArea.getZoneSid());
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseZone.getWarehouseSid());
if (StringUtils.isNotBlank(kcSid)){ if (StringUtils.isNotBlank(kcSid)){
WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery(); WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
wmsUpdateCountQuery.setSid(kcSid); wmsUpdateCountQuery.setSid(kcSid);

14
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
View File

@ -1233,13 +1233,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
print.setSid(sid); print.setSid(sid);
WmsWarehouseRack rack = wmsWarehouseRackService.fetchBySid(sid); WmsWarehouseRack rack = wmsWarehouseRackService.fetchBySid(sid);
if (null != rack) { if (null != rack) {
String warehouseSid = rack.getWarehouseSid(); WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(rack.getLocationSid());
String locationSid = rack.getLocationSid();
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(warehouseSid);
if (null != warehouseInfo) {
print.setText(warehouseInfo.getWarehouseName());
}
WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(locationSid);
if (null != wmsWarehouseArea) { if (null != wmsWarehouseArea) {
print.setText0(wmsWarehouseArea.getAreaName()); print.setText0(wmsWarehouseArea.getAreaName());
if (StringUtils.isNotBlank(wmsWarehouseArea.getZoneSid())) { if (StringUtils.isNotBlank(wmsWarehouseArea.getZoneSid())) {
@ -1247,6 +1241,12 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
if (null != zone) { if (null != zone) {
if (StringUtils.isNotBlank(zone.getZoneName())) { if (StringUtils.isNotBlank(zone.getZoneName())) {
print.setText00(zone.getZoneName()); print.setText00(zone.getZoneName());
if (StringUtils.isNotBlank(zone.getWarehouseSid())) {
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(zone.getWarehouseSid());
if (null != warehouseInfo) {
print.setText(warehouseInfo.getWarehouseName());
}
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save