From 3a22c69bd91c60886483864f75cf1d226ad007a4 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 23 May 2023 17:56:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=89=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/databases/create_table.sql | 16 ++-- .../MaterialInventoryRecord.java | 7 +- .../MaterialInventoryRecordDetailsVo.java | 4 +- .../MaterialInventoryRecordDto.java | 7 +- .../MaterialInventoryRecordQuery.java | 7 +- .../MaterialInventoryRecordVo.java | 7 +- .../materialoutbound/MaterialOutbound.java | 5 +- .../MaterialOutboundDetailsVo.java | 2 +- .../materialoutbound/MaterialOutboundDto.java | 5 +- .../MaterialOutboundQuery.java | 4 +- .../materialoutbound/MaterialOutboundVo.java | 4 +- .../api/materialstorage/MaterialStorage.java | 5 +- .../MaterialStorageDetailsVo.java | 2 +- .../materialstorage/MaterialStorageDto.java | 5 +- .../materialstorage/MaterialStorageQuery.java | 5 +- .../materialstorage/MaterialStorageVo.java | 5 +- .../PackagingInventory.java | 26 +++++++ .../PackagingInventoryDetailsVo.java | 27 +++++++ .../PackagingInventoryDto.java | 27 +++++++ .../PackagingInventoryQuery.java | 28 +++++++ .../PackagingInventoryVo.java | 27 +++++++ .../PackagingInventoryRecord.java | 24 ++++++ .../PackagingInventoryRecordDetailsVo.java | 25 +++++++ .../PackagingInventoryRecordDto.java | 25 +++++++ .../PackagingInventoryRecordQuery.java | 28 +++++++ .../PackagingInventoryRecordVo.java | 30 ++++++++ .../packagingoutbound/PackagingOutbound.java | 28 +++++++ .../PackagingOutboundDetailsVo.java | 29 +++++++ .../PackagingOutboundDto.java | 29 +++++++ .../PackagingOutboundQuery.java | 31 ++++++++ .../PackagingOutboundVo.java | 34 +++++++++ .../packagingstorage/PackagingStorage.java | 33 ++++++++ .../PackagingStorageDetailsVo.java | 35 +++++++++ .../packagingstorage/PackagingStorageDto.java | 37 +++++++++ .../PackagingStorageQuery.java | 37 +++++++++ .../packagingstorage/PackagingStorageVo.java | 39 ++++++++++ .../cyf/api/packagingtype/PackagingType.java | 23 ++++++ .../packagingtype/PackagingTypeDetailsVo.java | 23 ++++++ .../api/packagingtype/PackagingTypeDto.java | 23 ++++++ .../api/packagingtype/PackagingTypeQuery.java | 23 ++++++ .../api/packagingtype/PackagingTypeVo.java | 23 ++++++ .../MaterialInventoryRecordService.java | 3 - .../MaterialOutboundService.java | 4 +- .../MaterialStorageService.java | 4 +- .../biz/materialtype/MaterialTypeMapper.java | 4 +- .../biz/materialtype/MaterialTypeRest.java | 4 +- .../biz/materialtype/MaterialTypeService.java | 4 +- .../PackagingInventoryMapper.java | 32 ++++++++ .../PackagingInventoryMapper.xml | 17 +++++ .../PackagingInventoryRest.java | 66 ++++++++++++++++ .../PackagingInventoryService.java | 75 +++++++++++++++++++ .../PackagingInventoryRecordMapper.java | 20 +++++ .../PackagingInventoryRecordMapper.xml | 18 +++++ .../PackagingInventoryRecordRest.java | 42 +++++++++++ .../PackagingInventoryRecordService.java | 49 ++++++++++++ .../PackagingOutboundMapper.java | 31 ++++++++ .../PackagingOutboundMapper.xml | 18 +++++ .../PackagingOutboundRest.java | 53 +++++++++++++ .../PackagingOutboundService.java | 72 ++++++++++++++++++ .../PackagingStorageMapper.java | 30 ++++++++ .../PackagingStorageMapper.xml | 18 +++++ .../PackagingStorageRest.java | 53 +++++++++++++ .../PackagingStorageService.java | 71 ++++++++++++++++++ .../packagingtype/PackagingTypeMapper.java | 26 +++++++ .../biz/packagingtype/PackagingTypeMapper.xml | 16 ++++ .../biz/packagingtype/PackagingTypeRest.java | 61 +++++++++++++++ .../packagingtype/PackagingTypeService.java | 68 +++++++++++++++++ 67 files changed, 1595 insertions(+), 68 deletions(-) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutbound.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorage.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingType.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDetailsVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryService.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeService.java diff --git a/yxt-supervise-cyf/docs/databases/create_table.sql b/yxt-supervise-cyf/docs/databases/create_table.sql index b0940ddf..10899271 100644 --- a/yxt-supervise-cyf/docs/databases/create_table.sql +++ b/yxt-supervise-cyf/docs/databases/create_table.sql @@ -73,7 +73,7 @@ CREATE TABLE `crude_oil_storage` ( `licensePlateNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发货车牌号', `tankSid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', `weight` double(255, 2) NULL DEFAULT NULL COMMENT '收料净重', - `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '收料价值', + `value` double(100, 2) NULL DEFAULT NULL COMMENT '收料价值', `warehousingDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库日期', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 16 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油入库' ROW_FORMAT = Dynamic; @@ -99,7 +99,7 @@ CREATE TABLE `crude_oil_outbound` ( `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '签订日期', `tankSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '油罐sid', `weight` double(100, 2) NULL DEFAULT NULL COMMENT '净重', - `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价值', + `value` double(100, 2) NULL DEFAULT NULL COMMENT '价值', `deliveryDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原油出库记录' ROW_FORMAT = Dynamic; @@ -243,8 +243,8 @@ CREATE TABLE `material_storage`( `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同签订日期', `licensePlateNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发货车牌号', `inventorySid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料库存sid', -`weight` double(255, 0) NULL DEFAULT NULL COMMENT '收料净重', -`value` double(255) NULL DEFAULT NULL COMMENT '收料价值', +`weight` double(100,2) NULL DEFAULT NULL COMMENT '收料净重', +`value` double(100,2) NULL DEFAULT NULL COMMENT '收料价值', `warehousingDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库日期', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原料入库信息' ROW_FORMAT = Dynamic; @@ -423,8 +423,8 @@ CREATE TABLE `packaging_storage` ( `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同签订日期', `licensePlateNumber` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '发货车牌号', `inventorySid` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '包装物库存sid', -`weight` double(255, 0) NULL DEFAULT NULL COMMENT '收料净重', - `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '收料价值', +`weight` double(100, 2) NULL DEFAULT NULL COMMENT '收料净重', + `value` double(100, 2) NULL DEFAULT NULL COMMENT '收料价值', `warehousingDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库日期', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '包装物入库' ROW_FORMAT = Dynamic; @@ -450,7 +450,7 @@ CREATE TABLE `packaging_outbound` ( `deliveryDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '出库日期', `inventorySid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '包装物库存sid', `weight` double(100, 2) NULL DEFAULT NULL COMMENT '净重', - `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价值', + `value` double(100, 2) NULL DEFAULT NULL COMMENT '价值', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '包装物出库' ROW_FORMAT = Dynamic; @@ -472,7 +472,7 @@ CREATE TABLE `packaging_inventory_record` ( `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid', `inventoryDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '盘库日期', `inventory` double(100, 2) NULL DEFAULT NULL COMMENT '库存数量', - `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '价值', + `value` double(100, 2) NULL DEFAULT NULL COMMENT '价值', `inventorySid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '包装物类型sid', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '包装物盘库记录' ROW_FORMAT = Dynamic; diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java index e1cb1019..96c4aa7f 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java @@ -16,11 +16,10 @@ public class MaterialInventoryRecord extends BaseEntity { //盘库日期 private String inventoryDate; //盘库库存 - private String inventory; + private double inventory; //物料类型 private String typeSid; //价值 - private String value; - //1 原料 2 包装物 - private String type; + private double value; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDetailsVo.java index e6c4496c..8435dc97 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDetailsVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDetailsVo.java @@ -17,9 +17,9 @@ public class MaterialInventoryRecordDetailsVo implements Vo { //盘库日期 private String inventoryDate; //盘库库存 - private String inventory; + private double inventory; //物料类型 private String typeSid; //价值 - private String value; + private double value; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDto.java index d9a9a059..b98c42c7 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDto.java @@ -13,15 +13,12 @@ import lombok.Data; public class MaterialInventoryRecordDto implements Dto { private String id; private String sid; - //盘库日期 private String inventoryDate; //盘库库存 - private String inventory; + private double inventory; //物料类型 private String typeSid; //价值 - private String value; - //1 原料 2 包装物 - private String type; + private double value; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordQuery.java index 42a6597e..7a6e3ed8 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordQuery.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordQuery.java @@ -17,13 +17,12 @@ public class MaterialInventoryRecordQuery implements Query { //盘库日期 private String inventoryDate; //盘库库存 - private String inventory; + private double inventory; //物料类型 private String typeSid; //价值 - private String value; + private double value; private String date; private String name; - //1:物料 2包装物 - private String type; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordVo.java index 8b233db7..e90aacd2 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordVo.java @@ -17,16 +17,15 @@ public class MaterialInventoryRecordVo implements Vo { //盘库日期 private String inventoryDate; //盘库库存 - private String inventory; + private double inventory; //物料库存sid private String inventorySid; //价值 - private String value; + private double value; //物料名称 private String name; //物料类名称 private String typeName; - //1 原料 2 包装物 - private String type; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutbound.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutbound.java index 21d0cf8c..8b8ae38e 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutbound.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutbound.java @@ -24,7 +24,6 @@ public class MaterialOutbound extends BaseEntity { //净重 private double weight; //价值 - private String value; - //1 原料 2 包装物 - private String type; + private double value; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDetailsVo.java index 64b571f3..1566cb2a 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDetailsVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDetailsVo.java @@ -25,5 +25,5 @@ public class MaterialOutboundDetailsVo implements Vo { //净重 private double weight; //价值 - private String value; + private double value; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDto.java index ce052470..66e6957f 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDto.java @@ -25,7 +25,6 @@ public class MaterialOutboundDto implements Dto { //净重 private double weight; //价值 - private String value; - //1 原料 2 包装物 - private String type; + private double value; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundQuery.java index 57b534b5..8ee89ad7 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundQuery.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundQuery.java @@ -25,9 +25,7 @@ public class MaterialOutboundQuery implements Query { //净重 private double weight; //价值 - private String value; + private double value; private String date; private String contractNumber; - //1:物料 2包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundVo.java index 82006b2d..ef01be93 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundVo.java @@ -27,9 +27,7 @@ public class MaterialOutboundVo implements Vo { private double weight; private String name; //价值 - private String value; + private double value; //物料库存 private double inventory; - //1 原料 2 包装物 - private String type; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java index 54de0a23..a4b66535 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java @@ -26,10 +26,9 @@ public class MaterialStorage extends BaseEntity { //净重 private double weight; //价值 - private String value; + private double value; //入库日期 private String warehousingDate; - //1 原料 2 包装物 - private String type; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDetailsVo.java index f6ba36c8..6faf3975 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDetailsVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDetailsVo.java @@ -27,7 +27,7 @@ public class MaterialStorageDetailsVo implements Vo { //净重 private double weight; //价值 - private String value; + private double value; //入库日期 private String warehousingDate; //油罐库存 diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDto.java index 10ba37fb..42e4302b 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDto.java @@ -27,11 +27,10 @@ public class MaterialStorageDto implements Dto { //净重 private double weight; //价值 - private String value; + private double value; //入库日期 private String warehousingDate; //油罐库存 private double inventory=0; - //1 原料 2 包装物 - private String type; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageQuery.java index 256f6eeb..43fe58bb 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageQuery.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageQuery.java @@ -27,12 +27,11 @@ public class MaterialStorageQuery implements Query { //净重 private double weight; //价值 - private String value; + private double value; //入库日期 private String warehousingDate; //油罐库存 private double inventory=0; private String date; - //1:物料 2包装物 - private String type; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java index 6e3ebde7..7a0ec74a 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java @@ -29,13 +29,12 @@ public class MaterialStorageVo implements Vo { //净重 private double weight; //价值 - private String value; + private double value; //入库日期 private String warehousingDate; //油罐库存 private double inventory=0; //物料名称 private String name; - //1 原料 2 包装物 - private String type; + } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java new file mode 100644 index 00000000..d54880c4 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.api.packaginginventory; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "包装物库存信息", description = "包装物库存信息") +@TableName("packaging_inventory") +public class PackagingInventory extends BaseEntity { + //包装物名称 + private String name; + //包装物编码 + private String number; + //包装物库存 + private double inventory=0; + //包装物初始库存 + private double initialInventory=0; + //包装物类型 + private String typeSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDetailsVo.java new file mode 100644 index 00000000..c396acf8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDetailsVo.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.packaginginventory; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物库存信息 视图数据详情", description = "包装物库存信息 视图数据详情") +public class PackagingInventoryDetailsVo implements Vo { + private String id; + private String sid; + + //包装物名称 + private String name; + //包装物编码 + private String number; + //包装物库存 + private double inventory=0; + //包装物初始库存 + private double initialInventory=0; + //包装物类型 + private String typeSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java new file mode 100644 index 00000000..23f1b145 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.packaginginventory; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物库存信息 数据传输对象", description = "包装物库存信息 数据传输对象") +public class PackagingInventoryDto implements Dto { + private String id; + private String sid; + //包装物名称 + private String name; + //包装物编码 + private String number; + //包装物库存 + private double inventory=0; + //包装物初始库存 + private double initialInventory=0; + //包装物类型 + private String typeSid; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryQuery.java new file mode 100644 index 00000000..9cf59d04 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryQuery.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.api.packaginginventory; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物库存信息 查询条件", description = "包装物库存信息 查询条件") +public class PackagingInventoryQuery implements Query { + private String id; + private String sid; + + //包装物名称 + private String name; + //包装物编码 + private String number; + //包装物库存 + private double inventory=0; + //包装物初始库存 + private double initialInventory=0; + //包装物类型 + private String typeSid; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java new file mode 100644 index 00000000..b2317b9c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.packaginginventory; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物库存信息 视图数据对象", description = "包装物库存信息 视图数据对象") +public class PackagingInventoryVo implements Vo { + private String id; + private String sid; + + //包装物名称 + private String name; + //包装物编码 + private String number; + //包装物库存 + private double inventory=0; + //包装物初始库存 + private double initialInventory=0; + //包装物类型 + private String typeSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java new file mode 100644 index 00000000..dda78887 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.packaginginventoryrecord; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "包装物盘库记录信息", description = "包装物盘库记录信息") +@TableName("material_inventory_record") +public class PackagingInventoryRecord extends BaseEntity { + //盘库日期 + private String inventoryDate; + //盘库库存 + private double inventory; + //包装物类型 + private String typeSid; + //价值 + private double value; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDetailsVo.java new file mode 100644 index 00000000..6135aa20 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDetailsVo.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.packaginginventoryrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物盘库记录信息 视图数据详情", description = "包装物盘库记录信息 视图数据详情") +public class PackagingInventoryRecordDetailsVo implements Vo { + private String id; + private String sid; + + //盘库日期 + private String inventoryDate; + //盘库库存 + private double inventory; + //包装物类型 + private String typeSid; + //价值 + private double value; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java new file mode 100644 index 00000000..d89f70d8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.packaginginventoryrecord; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物盘库记录信息 数据传输对象", description = "包装物盘库记录信息 数据传输对象") +public class PackagingInventoryRecordDto implements Dto { + private String id; + private String sid; + + //盘库日期 + private String inventoryDate; + //盘库库存 + private double inventory; + //包装物类型 + private String typeSid; + //价值 + private double value; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordQuery.java new file mode 100644 index 00000000..f54dc754 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordQuery.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.api.packaginginventoryrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物盘库记录信息 查询条件", description = "包装物盘库记录信息 查询条件") +public class PackagingInventoryRecordQuery implements Query { + private String id; + private String sid; + + //盘库日期 + private String inventoryDate; + //盘库库存 + private double inventory; + //包装物类型 + private String typeSid; + //价值 + private double value; + private String date; + private String name; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordVo.java new file mode 100644 index 00000000..0773681c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordVo.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.cyf.api.packaginginventoryrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物盘库记录信息 视图数据对象", description = "包装物盘库记录信息 视图数据对象") +public class PackagingInventoryRecordVo implements Vo { + private String id; + private String sid; + + //盘库日期 + private String inventoryDate; + //盘库库存 + private double inventory; + //包装物库存sid + private String inventorySid; + //价值 + private double value; + //包装物名称 + private String name; + //包装物类名称 + private String typeName; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutbound.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutbound.java new file mode 100644 index 00000000..ed84b879 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutbound.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.api.packagingoutbound; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "包装物出库信息", description = "包装物出库信息") +@TableName("packaging_outbound") +public class PackagingOutbound extends BaseEntity { + //销售合同号 + private String salesContractNumber; + //合同签订日期 + private String contractSigningDate; + //出库日期 + private String deliveryDate; + //包装物库存sid + private String inventorySid; + //净重 + private double weight; + //价值 + private double value; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDetailsVo.java new file mode 100644 index 00000000..9d4646fe --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDetailsVo.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.api.packagingoutbound; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物出库信息 视图数据详情", description = "包装物出库信息 视图数据详情") +public class PackagingOutboundDetailsVo implements Vo { + private String id; + private String sid; + + //销售合同号 + private String salesContractNumber; + //合同签订日期 + private String contractSigningDate; + //出库日期 + private String deliveryDate; + //包装物库存sid + private String inventorySid; + //净重 + private double weight; + //价值 + private String value; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDto.java new file mode 100644 index 00000000..0881a058 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundDto.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.api.packagingoutbound; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物出库信息 数据传输对象", description = "包装物出库信息 数据传输对象") +public class PackagingOutboundDto implements Dto { + private String id; + private String sid; + + //销售合同号 + private String salesContractNumber; + //合同签订日期 + private String contractSigningDate; + //出库日期 + private String deliveryDate; + //包装物库存sid + private String inventorySid; + //净重 + private double weight; + //价值 + private double value; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundQuery.java new file mode 100644 index 00000000..657424bd --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundQuery.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.api.packagingoutbound; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物出库信息 查询条件", description = "包装物出库信息 查询条件") +public class PackagingOutboundQuery implements Query { + private String id; + private String sid; + + //销售合同号 + private String salesContractNumber; + //合同签订日期 + private String contractSigningDate; + //出库日期 + private String deliveryDate; + //包装物库存sid + private String inventorySid; + //净重 + private double weight; + //价值 + private double value; + private String date; + private String contractNumber; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundVo.java new file mode 100644 index 00000000..00ceb74f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingoutbound/PackagingOutboundVo.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.cyf.api.packagingoutbound; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "油罐信息 视图数据对象", description = "油罐信息 视图数据对象") +public class PackagingOutboundVo implements Vo { + private String id; + private String sid; + + //销售合同号 + private String salesContractNumber; + //合同签订日期 + private String contractSigningDate; + //出库日期 + private String deliveryDate; + //包装物库存sid + private String inventorySid; + private String typeName; + //净重 + private double weight; + private String name; + //价值 + private double value; + //包装物库存 + private double inventory; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorage.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorage.java new file mode 100644 index 00000000..6fec6db8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorage.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.cyf.api.packagingstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "包装物入库信息", description = "包装物入库信息") +@TableName("packaging_storage") +public class PackagingStorage extends BaseEntity { + //合同号 + private String contractNumber; + //供应商sid + private String supplierSid; + //签订日期 + private String contractSigningDate; + //发货车牌号 + private String licensePlateNumber; + // + private String inventorySid; + //净重 + private double weight; + //价值 + private double value; + //入库日期 + private String warehousingDate; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDetailsVo.java new file mode 100644 index 00000000..a8ec1b61 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDetailsVo.java @@ -0,0 +1,35 @@ +package com.yxt.supervise.cyf.api.packagingstorage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物入库信息 视图数据详情", description = "包装物入库信息 视图数据详情") +public class PackagingStorageDetailsVo implements Vo { + private String id; + private String sid; + + //合同号 + private String contractNumber; + //供应商sid + private String supplierSid; + //签订日期 + private String contractSigningDate; + //发货车牌号 + private String licensePlateNumber; + // + private String inventorySid; + //净重 + private double weight; + //价值 + private String value; + //入库日期 + private String warehousingDate; + //油罐库存 + private double inventory=0; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java new file mode 100644 index 00000000..0e9a391e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageDto.java @@ -0,0 +1,37 @@ +package com.yxt.supervise.cyf.api.packagingstorage; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物入库信息 数据传输对象", description = "包装物入库信息 数据传输对象") +public class PackagingStorageDto implements Dto { + private String id; + private String sid; + + //合同号 + private String contractNumber; + //供应商sid + private String supplierSid; + //签订日期 + private String contractSigningDate; + //发货车牌号 + private String licensePlateNumber; + // + private String inventorySid; + //净重 + private double weight; + //价值 + private String value; + //入库日期 + private String warehousingDate; + //油罐库存 + private double inventory=0; + //1 原料 2 包装物 + private String type; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageQuery.java new file mode 100644 index 00000000..861d1161 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageQuery.java @@ -0,0 +1,37 @@ +package com.yxt.supervise.cyf.api.packagingstorage; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物入库信息 查询条件", description = "包装物入库信息 查询条件") +public class PackagingStorageQuery implements Query { + private String id; + private String sid; + + //合同号 + private String contractNumber; + //供应商sid + private String supplierSid; + //签订日期 + private String contractSigningDate; + //发货车牌号 + private String licensePlateNumber; + // + private String inventorySid; + //净重 + private double weight; + //价值 + private String value; + //入库日期 + private String warehousingDate; + //油罐库存 + private double inventory=0; + private String date; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java new file mode 100644 index 00000000..c10b32a8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingstorage/PackagingStorageVo.java @@ -0,0 +1,39 @@ +package com.yxt.supervise.cyf.api.packagingstorage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物入库信息 视图数据对象", description = "包装物入库信息 视图数据对象") +public class PackagingStorageVo implements Vo { + private String id; + private String sid; + + //合同号 + private String contractNumber; + //供应商sid + private String supplierSid; + //签订日期 + private String contractSigningDate; + //发货车牌号 + private String licensePlateNumber; + //包装物库存sid + private String inventorySid; + //包装物类型名称 + private String typeName; + //净重 + private double weight; + //价值 + private String value; + //入库日期 + private String warehousingDate; + //油罐库存 + private double inventory=0; + //包装物名称 + private String name; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingType.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingType.java new file mode 100644 index 00000000..901ad216 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingType.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.packagingtype; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:26 + */ +@Data +@ApiModel(value = "包装物类型信息", description = "包装物类型信息") +@TableName("packaging_type") +public class PackagingType extends BaseEntity { + //包装物编号 + private String number; + //包装物名称 + private String name; + //包装物code + private String code; + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDetailsVo.java new file mode 100644 index 00000000..c48e5f94 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDetailsVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.packagingtype; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物类型信息 视图数据详情", description = "包装物类型信息 视图数据详情") +public class PackagingTypeDetailsVo implements Vo { + private String id; + private String sid; + + //包装物编号 + private String number; + //包装物名称 + private String name; + //包装物code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDto.java new file mode 100644 index 00000000..d02394e0 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeDto.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.packagingtype; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:28 + */ +@Data +@ApiModel(value = "包装物类型信息 数据传输对象", description = "包装物类型信息 数据传输对象") +public class PackagingTypeDto implements Dto { + private String id; + private String sid; + + //包装物编号 + private String number; + //包装物名称 + private String name; + //包装物code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeQuery.java new file mode 100644 index 00000000..eab859e4 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.packagingtype; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物类型信息 查询条件", description = "包装物类型信息 查询条件") +public class PackagingTypeQuery implements Query { + private String id; + private String sid; + + //包装物编号 + private String number; + //包装物名称 + private String name; + //包装物code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeVo.java new file mode 100644 index 00000000..2155a088 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingtype/PackagingTypeVo.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.cyf.api.packagingtype; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/5/4 14:29 + */ +@Data +@ApiModel(value = "包装物类型信息 视图数据对象", description = "包装物类型信息 视图数据对象") +public class PackagingTypeVo implements Vo { + private String id; + private String sid; + + //包装物编号 + private String number; + //包装物名称 + private String name; + //包装物code + private String code; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordService.java index 3d7ac5f3..7f514320 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordService.java @@ -32,9 +32,6 @@ public class MaterialInventoryRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundService.java index b3ae9df0..c0204f67 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundService.java @@ -40,9 +40,7 @@ public class MaterialOutboundService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java index abb01e1d..8455f254 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java @@ -40,9 +40,7 @@ public class MaterialStorageService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.java index 150fefbc..88e0c97e 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.java @@ -19,8 +19,8 @@ import java.util.List; @Mapper public interface MaterialTypeMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from material_type where type=#{type}") - List typeList(@Param("type") String type); + @Select("select * from material_type") + List typeList(); @Select("select * from material_type where sid=#{sid}") MaterialType getTypeBySid(@Param("sid")String sid); } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeRest.java index f623c883..f5d135f8 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeRest.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeRest.java @@ -33,9 +33,9 @@ public class MaterialTypeRest { } @ApiOperation("根据物料类型查询数据的列表") @PostMapping("/typeList") - public ResultBean> typeList(String type) { + public ResultBean> typeList() { ResultBean rb = ResultBean.fireFail(); - List pv = RawMaterialTypeService.typeList(type); + List pv = RawMaterialTypeService.typeList(); return rb.success().setData(pv); } @ApiOperation("新增") diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java index 64464158..e609b113 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java @@ -36,8 +36,8 @@ public class MaterialTypeService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } - public List typeList(String type) { - return baseMapper.typeList(type); + public List typeList() { + return baseMapper.typeList(); } public ResultBean save(MaterialTypeDto dto){ ResultBean rb=new ResultBean(); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.java new file mode 100644 index 00000000..1dffd8d8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.java @@ -0,0 +1,32 @@ +package com.yxt.supervise.cyf.biz.packaginginventory; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventory; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo; +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 2023/5/4 14:37 + */ +@Mapper +public interface PackagingInventoryMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select(" SELECT" + + " *,t.name as typeName" + + " FROM" + + " packaging_inventory r" + + " left join packaging_type t on t.sid=r.typeSid ") + List inventoryList(); + @Select("select * from packaging_inventory where sid=#{sid}") + PackagingInventory getInventoryBySid(@Param("sid")String sid); + @Select("select * from packaging_inventory where typeSid=#{sid}") + List getInventory(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml new file mode 100644 index 00000000..617d04ed --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java new file mode 100644 index 00000000..147fa52f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryRest.java @@ -0,0 +1,66 @@ +package com.yxt.supervise.cyf.biz.packaginginventory; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryDto; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryQuery; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo; +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 2023/5/4 14:38 + */ +@Api(tags = "包装物库存信息") +@RestController +@RequestMapping("cyf/packinventory") +public class PackagingInventoryRest { + @Autowired + PackagingInventoryService packagingPackagingInventoryService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = packagingPackagingInventoryService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/inventoryList") + public ResultBean> inventoryList() { + ResultBean rb = ResultBean.fireFail(); + List pv = packagingPackagingInventoryService.inventoryList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody PackagingInventoryDto dto){ + return packagingPackagingInventoryService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody PackagingInventoryDto dto){ + return packagingPackagingInventoryService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getInventoryBySid/{sid}") + public ResultBean getInventoryBySid(@PathVariable String sid){ + return packagingPackagingInventoryService.getInventoryBySid(sid); + } + @ApiOperation("根据typeSid查询") + @GetMapping("/getInventory/{sid}") + public ResultBean getInventory(@PathVariable String typeSid){ + return packagingPackagingInventoryService.getInventory(typeSid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return packagingPackagingInventoryService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryService.java new file mode 100644 index 00000000..d4e4e5b5 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryService.java @@ -0,0 +1,75 @@ +package com.yxt.supervise.cyf.biz.packaginginventory; + +import cn.hutool.core.bean.BeanUtil; +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.supervise.cyf.api.packaginginventory.PackagingInventory; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryDto; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryQuery; +import com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class PackagingInventoryService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + PackagingInventoryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("r.name",query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List inventoryList() { + + return baseMapper.inventoryList(); + } + public ResultBean save(PackagingInventoryDto dto){ + ResultBean rb=new ResultBean(); + PackagingInventory entity=new PackagingInventory(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setInventory(dto.getInitialInventory()); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (PackagingInventoryDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + PackagingInventory entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getInventoryBySid(String sid){ + ResultBean rb=new ResultBean(); + PackagingInventory RawPackagingInventory=baseMapper.getInventoryBySid(sid); + return rb.success().setData(RawPackagingInventory); + } + + public ResultBean getInventory(String sid){ + ResultBean rb=new ResultBean(); + List RawPackagingInventory=baseMapper.getInventory(sid); + return rb.success().setData(RawPackagingInventory); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.java new file mode 100644 index 00000000..5f3d2b15 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.java @@ -0,0 +1,20 @@ +package com.yxt.supervise.cyf.biz.packaginginventoryrecord; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecord; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Mapper +public interface PackagingInventoryRecordMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml new file mode 100644 index 00000000..36d61b59 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordRest.java new file mode 100644 index 00000000..43f6f5a3 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordRest.java @@ -0,0 +1,42 @@ +package com.yxt.supervise.cyf.biz.packaginginventoryrecord; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordDto; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordQuery; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo; +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; + +/** + * @author wangpengfei + * @date 2023/5/4 14:38 + */ +@Api(tags = "包装物盘库信息") +@RestController +@RequestMapping("cyf/packrecord") +public class PackagingInventoryRecordRest { + @Autowired + PackagingInventoryRecordService PackagingInventoryRecordService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = PackagingInventoryRecordService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody PackagingInventoryRecordDto dto){ + return PackagingInventoryRecordService.save(dto); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java new file mode 100644 index 00000000..c6b0e496 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordService.java @@ -0,0 +1,49 @@ +package com.yxt.supervise.cyf.biz.packaginginventoryrecord; + +import cn.hutool.core.bean.BeanUtil; +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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecord; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordDto; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordQuery; +import com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class PackagingInventoryRecordService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + PackagingInventoryRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(r.inventoryDate,'%Y-%m-%d')", query.getDate()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.like("i.name", query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean save(PackagingInventoryRecordDto dto){ + ResultBean rb=new ResultBean(); + PackagingInventoryRecord entity=new PackagingInventoryRecord(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.java new file mode 100644 index 00000000..b544b3a1 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.cyf.biz.packagingoutbound; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutbound; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo; +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 2023/5/4 14:37 + */ +@Mapper +public interface PackagingOutboundMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select(" SELECT" + + " *,t.name as typeName,i.inventory as inventory" + + " FROM" + + " packaging_outbound o" + + " left join packaging_inventory i on i.sid=o.inventorySid" + + " left join packaging_type t on t.sid=i.typeSid") + List outboundList(); + @Select("select * from tank_information where sid=#{sid}") + PackagingOutbound getOutboundBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml new file mode 100644 index 00000000..7c446eae --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundRest.java new file mode 100644 index 00000000..4a406875 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundRest.java @@ -0,0 +1,53 @@ +package com.yxt.supervise.cyf.biz.packagingoutbound; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundDto; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundQuery; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo; +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 2023/5/4 14:38 + */ +@Api(tags = "包装物出库信息") +@RestController +@RequestMapping("cyf/packoutbound") +public class PackagingOutboundRest { + @Autowired + PackagingOutboundService PackagingOutboundService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = PackagingOutboundService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/outboundList") + public ResultBean> outboundList() { + ResultBean rb = ResultBean.fireFail(); + List pv = PackagingOutboundService.outboundList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody PackagingOutboundDto dto){ + return PackagingOutboundService.save(dto); + } + + @ApiOperation("根据sid查询") + @GetMapping("/getOutboundBySid/{sid}") + public ResultBean getOutboundBySid(@PathVariable String sid){ + return PackagingOutboundService.getOutboundBySid(sid); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java new file mode 100644 index 00000000..044b3ff6 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundService.java @@ -0,0 +1,72 @@ +package com.yxt.supervise.cyf.biz.packagingoutbound; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutbound; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundDto; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundQuery; +import com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo; +import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class PackagingOutboundService extends MybatisBaseService { + + @Autowired + MaterialInventoryMapper rawMaterialInventoryMapper; + public PagerVo listPageVo(PagerQuery pq) { + PackagingOutboundQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(o.deliverDate,'%Y-%m-%d')", query.getDate()); + } + if (StringUtils.isNotBlank(query.getContractNumber())) { + qw.like("o.salesContractNumber", query.getContractNumber()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List outboundList() { + + return baseMapper.outboundList(); + } + public ResultBean save(PackagingOutboundDto dto){ + ResultBean rb=new ResultBean(); + PackagingOutbound entity=new PackagingOutbound(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + Date curDate = new Date(); + String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); + entity.setDeliveryDate(dfmt); + baseMapper.insert(entity); + MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper().eq("sid",dto.getInventorySid())); + rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()-dto.getWeight()); + rawMaterialInventoryMapper.updateById(rawMaterialInventory); + return rb.success().setMsg("新增成功"); + } + + public ResultBean getOutboundBySid(String sid){ + ResultBean rb=new ResultBean(); + PackagingOutbound RawPackagingOutbound=baseMapper.getOutboundBySid(sid); + return rb.success().setData(RawPackagingOutbound); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.java new file mode 100644 index 00000000..76b4e737 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.cyf.biz.packagingstorage; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorage; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo; +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 2023/5/4 14:37 + */ +@Mapper +public interface PackagingStorageMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select(" *,t.name as typeName,i.inventory as inventory" + + " FROM" + + " packaging_storage s" + + " left join packaging_inventory i on i.sid=s.inventorySid" + + " left join packaging_type t on t.sid=i.typeSid") + List StorageList(); + @Select("select * from packaging_storage where sid=#{sid}") + PackagingStorage getStorageBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml new file mode 100644 index 00000000..521967c4 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageRest.java new file mode 100644 index 00000000..f5e509e8 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageRest.java @@ -0,0 +1,53 @@ +package com.yxt.supervise.cyf.biz.packagingstorage; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageDto; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageQuery; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo; +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 2023/5/4 14:38 + */ +@Api(tags = "包装物入库消息") +@RestController +@RequestMapping("cyf/packstorage") +public class PackagingStorageRest { + @Autowired + PackagingStorageService PackagingStorageService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = PackagingStorageService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/tankList") + public ResultBean> listPage() { + ResultBean rb = ResultBean.fireFail(); + List pv = PackagingStorageService.StorageList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody PackagingStorageDto dto){ + return PackagingStorageService.save(dto); + } + + @ApiOperation("根据sid查询") + @GetMapping("/getTankBySid/{sid}") + public ResultBean getTankBySid(@PathVariable String sid){ + return PackagingStorageService.getTankBySid(sid); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java new file mode 100644 index 00000000..a856c0fe --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageService.java @@ -0,0 +1,71 @@ +package com.yxt.supervise.cyf.biz.packagingstorage; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorage; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageDto; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageQuery; +import com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo; +import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class PackagingStorageService extends MybatisBaseService { + + @Autowired + MaterialInventoryMapper rawMaterialInventoryMapper; + public PagerVo listPageVo(PagerQuery pq) { + PackagingStorageQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getDate())) { + qw.eq("STR_TO_DATE(s.warehousingDate,'%Y-%m-%d')", query.getDate()); + } + if (StringUtils.isNotBlank(query.getContractNumber())) { + qw.like("s.salesContractNumber", query.getContractNumber()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List StorageList() { + return baseMapper.StorageList(); + } + public ResultBean save(PackagingStorageDto dto){ + ResultBean rb=new ResultBean(); + PackagingStorage entity=new PackagingStorage(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + Date curDate = new Date(); + String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); + entity.setWarehousingDate(dfmt); + baseMapper.insert(entity); + MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper().eq("sid",dto.getInventorySid())); + rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()+dto.getWeight()); + rawMaterialInventoryMapper.updateById(rawMaterialInventory); + return rb.success().setMsg("新增成功"); + } + + public ResultBean getTankBySid(String sid){ + ResultBean rb=new ResultBean(); + PackagingStorage RawPackagingStorage=baseMapper.getStorageBySid(sid); + return rb.success().setData(RawPackagingStorage); + } + +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.java new file mode 100644 index 00000000..c1584d1d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.biz.packagingtype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.packagingtype.PackagingType; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeVo; +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 2023/5/4 14:37 + */ +@Mapper +public interface PackagingTypeMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from packaging_type") + List typeList(); + @Select("select * from packaging_type where sid=#{sid}") + PackagingType getTypeBySid(@Param("sid")String sid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.xml new file mode 100644 index 00000000..94f9e153 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeRest.java new file mode 100644 index 00000000..905f4a2d --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.cyf.biz.packagingtype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeDto; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeQuery; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeVo; +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 2023/5/4 14:38 + */ +@Api(tags = "包装物类型信息") +@RestController + @RequestMapping("cyf/packtype") +public class PackagingTypeRest { + @Autowired + PackagingTypeService PackagingTypeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = PackagingTypeService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation("根据物料类型查询数据的列表") + @PostMapping("/typeList") + public ResultBean> typeList() { + ResultBean rb = ResultBean.fireFail(); + List pv = PackagingTypeService.typeList(); + return rb.success().setData(pv); + } + @ApiOperation("新增") + @PostMapping("/save") + public ResultBean save (@RequestBody PackagingTypeDto dto){ + return PackagingTypeService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update (@RequestBody PackagingTypeDto dto){ + return PackagingTypeService.update(dto); + } + @ApiOperation("根据sid查询") + @GetMapping("/getTypeBySid/{sid}") + public ResultBean getTypeBySid(@PathVariable String sid){ + return PackagingTypeService.getTypeBySid(sid); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid ){ + return PackagingTypeService.del(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeService.java new file mode 100644 index 00000000..062c7058 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeService.java @@ -0,0 +1,68 @@ +package com.yxt.supervise.cyf.biz.packagingtype; + +import cn.hutool.core.bean.BeanUtil; +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.supervise.cyf.api.packagingtype.PackagingType; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeDto; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeQuery; +import com.yxt.supervise.cyf.api.packagingtype.PackagingTypeVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/5/4 14:37 + */ +@Service +public class PackagingTypeService extends MybatisBaseService { + + + public PagerVo listPageVo(PagerQuery pq) { + PackagingTypeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if(StringUtils.isNotBlank(query.getName())){ + qw.like("name",query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List typeList() { + return baseMapper.typeList(); + } + public ResultBean save(PackagingTypeDto dto){ + ResultBean rb=new ResultBean(); + PackagingType entity=new PackagingType(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("新增成功"); + } + public ResultBean update (PackagingTypeDto dto){ + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + PackagingType entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public ResultBean getTypeBySid(String sid){ + ResultBean rb=new ResultBean(); + PackagingType RawPackagingType=baseMapper.getTypeBySid(sid); + return rb.success().setData(RawPackagingType); + } + public ResultBean del(String sid){ + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } +}