接口修改 脚本修改

yxt-supervise-cyf/docs/databases/create_table.sql

@@ -145,8 +145,8 @@ PRIMARY KEY (`id`) USING BTREE
 
 SET FOREIGN_KEY_CHECKS = 1;
 
-DROP TABLE IF EXISTS `raw_material_inventory`;
+DROP TABLE IF EXISTS `material_inventory`;
-CREATE TABLE `raw_material_inventory`(
+CREATE TABLE `material_inventory`(
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
 `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
 `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
@@ -158,42 +158,44 @@ CREATE TABLE `raw_material_inventory`(
 `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
 `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
 `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料名称',
+`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料名称',
-`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料编号',
+`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料编号',
-`inventory` double(100, 0) NULL DEFAULT NULL COMMENT '原料库存',
+`inventory` double(100, 0) NULL DEFAULT NULL COMMENT '物料库存',
-`initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '原料初始库存',
+`initialInventory` double(100, 0) NULL DEFAULT NULL COMMENT '物料初始库存',
-`typeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料类型sid',
+`typeSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料类型sid',
 `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1:原料2包装物',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原料库存' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物料库存' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
-DROP TABLE IF EXISTS `raw_material_inventory_record`;
+
-CREATE TABLE `raw_material_inventory_record`(
+DROP TABLE IF EXISTS `material_inventory_record`;
-`id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
+CREATE TABLE `material_inventory_record`(
-`sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+ `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
-`lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+ `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
-`createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+ `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
-`modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+ `createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
-`isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
+ `modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
-`state` int(0) NULL DEFAULT 1 COMMENT '状态',
+ `isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
-`isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
+ `state` int(0) NULL DEFAULT 1 COMMENT '状态',
-`remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+ `isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
-`createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
+ `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-`updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
+ `createBySid` 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 '盘库日期',
+ `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-`inventory` double(100, 2) NULL DEFAULT NULL COMMENT '库存数量',
+ `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 '价值',
-`inventorySid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料库存类型sid',
+`inventorySid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料库存类型sid',
 `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1:原料2包装物',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '盘库记录' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物料盘库记录' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
-DROP TABLE IF EXISTS `raw_material_outbound`;
+
-CREATE TABLE `raw_material_outbound`(
+DROP TABLE IF EXISTS `material_outbound`;
+CREATE TABLE `material_outbound`(
  `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
  `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
  `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
@@ -208,18 +210,18 @@ CREATE TABLE `raw_material_outbound`(
  `salesContractNumber` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '销售合同号',
  `contractSigningDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '合同签订日期',
  `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',
+ `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 '价值',
 `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1:原料2包装物',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原料出库信息' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物料出库信息' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
 
-DROP TABLE IF EXISTS `raw_material_storage`;
+DROP TABLE IF EXISTS `material_storage`;
-CREATE TABLE `raw_material_storage`(
+CREATE TABLE `material_storage`(
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
 `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
 `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
@@ -235,18 +237,18 @@ CREATE TABLE `raw_material_storage`(
 `supplierSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '供货商sid`',
 `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',
+`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 '收料价值',
 `warehousingDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '入库日期',
 `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1:原料2包装物',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原料入库信息' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物料入库信息' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 
-DROP TABLE IF EXISTS `raw_material_type`;
+DROP TABLE IF EXISTS `material_type`;
-CREATE TABLE `raw_material_type`(
+CREATE TABLE `material_type`(
 `id` int(0) NOT NULL AUTO_INCREMENT COMMENT 'id',
 `sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
 `lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
@@ -258,12 +260,12 @@ CREATE TABLE `raw_material_type`(
 `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
 `createBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人sid',
 `updateBySid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人sid',
-`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料类型名称',
+`name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料类型名称',
-`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料编号',
+`number` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料编号',
-`code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '原料code',
+`code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料code',
 `type` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1:原料2包装物',
 PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '原料类型' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物料类型' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
 

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java

@@ -20,4 +20,6 @@ public class CrudeOilInventoryRecordQuery implements Query {
     private String tankSid;
     //记录时间
     private String recordDate;
+    private String date;
+    private String number;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventory/RawMaterialInventory.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventory;
+package com.yxt.supervise.cyf.api.materialinventory;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
@@ -10,17 +10,17 @@ import lombok.Data;
  * @date 2023/5/4 14:26
  */
 @Data
-@ApiModel(value = "原料料库存信息", description = "原料料库存信息")
+@ApiModel(value = "物料料库存信息", description = "物料料库存信息")
-@TableName("raw_material_inventory")
+@TableName("material_inventory")
-public class RawMaterialInventory extends BaseEntity {
+public class MaterialInventory extends BaseEntity {
-    //原料名称
+    //物料名称
     private String name;
-    //原料编码
+    //物料编码
     private String number;
     //油罐库存
     private double inventory=0;
     //油罐初始库存
     private double initialInventory=0;
-    //原料类型
+    //物料类型
     private String typeSid;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventory/RawMaterialInventoryDetailsVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventory;
+package com.yxt.supervise.cyf.api.materialinventory;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,19 +9,19 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料料库存信息 视图数据详情", description = "原料料库存信息 视图数据详情")
+@ApiModel(value = "物料料库存信息 视图数据详情", description = "物料料库存信息 视图数据详情")
-public class RawMaterialInventoryDetailsVo implements Vo {
+public class MaterialInventoryDetailsVo 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;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventory/RawMaterialInventoryDto.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventory;
+package com.yxt.supervise.cyf.api.materialinventory;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -9,19 +9,19 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料料库存信息 数据传输对象", description = "原料料库存信息 数据传输对象")
+@ApiModel(value = "物料料库存信息 数据传输对象", description = "物料料库存信息 数据传输对象")
-public class RawMaterialInventoryDto implements Dto {
+public class MaterialInventoryDto 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;
     //1 原料  2 包装物
     private String type;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventory/RawMaterialInventoryQuery.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventory;
+package com.yxt.supervise.cyf.api.materialinventory;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
@@ -9,21 +9,21 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料料库存信息 查询条件", description = "原料料库存信息 查询条件")
+@ApiModel(value = "物料料库存信息 查询条件", description = "物料料库存信息 查询条件")
-public class RawMaterialInventoryQuery implements Query {
+public class MaterialInventoryQuery 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;
-    //1:原料  2包装物
+    //1:物料  2包装物
     private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventory/RawMaterialInventoryVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventory;
+package com.yxt.supervise.cyf.api.materialinventory;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,21 +9,23 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料料库存信息 视图数据对象", description = "原料料库存信息 视图数据对象")
+@ApiModel(value = "物料料库存信息 视图数据对象", description = "物料料库存信息 视图数据对象")
-public class RawMaterialInventoryVo implements Vo {
+public class MaterialInventoryVo 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;
-    //原料类名称
+    //物料类名称
     private String typeName;
+    //1 原料  2 包装物
+    private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventoryrecord/RawMaterialInventoryRecord.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecord.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventoryrecord;
+package com.yxt.supervise.cyf.api.materialinventoryrecord;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
@@ -10,14 +10,14 @@ import lombok.Data;
  * @date 2023/5/4 14:26
  */
 @Data
-@ApiModel(value = "原料盘库记录信息", description = "原料盘库记录信息")
+@ApiModel(value = "物料盘库记录信息", description = "物料盘库记录信息")
-@TableName("raw_material_inventory_record")
+@TableName("material_inventory_record")
-public class RawMaterialInventoryRecord extends BaseEntity {
+public class MaterialInventoryRecord extends BaseEntity {
     //盘库日期
     private String inventoryDate;
     //盘库库存
     private String inventory;
-    //原料类型
+    //物料类型
     private String typeSid;
     //价值
     private String value;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventoryrecord/RawMaterialInventoryRecordDetailsVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventoryrecord;
+package com.yxt.supervise.cyf.api.materialinventoryrecord;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料盘库记录信息 视图数据详情", description = "原料盘库记录信息 视图数据详情")
+@ApiModel(value = "物料盘库记录信息 视图数据详情", description = "物料盘库记录信息 视图数据详情")
-public class RawMaterialInventoryRecordDetailsVo implements Vo {
+public class MaterialInventoryRecordDetailsVo implements Vo {
     private String id;
     private String sid;
 
@@ -18,7 +18,7 @@ public class RawMaterialInventoryRecordDetailsVo implements Vo {
     private String inventoryDate;
     //盘库库存
     private String inventory;
-    //原料类型
+    //物料类型
     private String typeSid;
     //价值
     private String value;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventoryrecord/RawMaterialInventoryRecordDto.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventoryrecord;
+package com.yxt.supervise.cyf.api.materialinventoryrecord;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料盘库记录信息 数据传输对象", description = "原料盘库记录信息 数据传输对象")
+@ApiModel(value = "物料盘库记录信息 数据传输对象", description = "物料盘库记录信息 数据传输对象")
-public class RawMaterialInventoryRecordDto implements Dto {
+public class MaterialInventoryRecordDto implements Dto {
     private String id;
     private String sid;
 
@@ -18,7 +18,7 @@ public class RawMaterialInventoryRecordDto implements Dto {
     private String inventoryDate;
     //盘库库存
     private String inventory;
-    //原料类型
+    //物料类型
     private String typeSid;
     //价值
     private String value;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventoryrecord/RawMaterialInventoryRecordQuery.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventoryrecord;
+package com.yxt.supervise.cyf.api.materialinventoryrecord;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料盘库记录信息 查询条件", description = "原料盘库记录信息 查询条件")
+@ApiModel(value = "物料盘库记录信息 查询条件", description = "物料盘库记录信息 查询条件")
-public class RawMaterialInventoryRecordQuery implements Query {
+public class MaterialInventoryRecordQuery implements Query {
     private String id;
     private String sid;
 
@@ -18,12 +18,12 @@ public class RawMaterialInventoryRecordQuery implements Query {
     private String inventoryDate;
     //盘库库存
     private String inventory;
-    //原料类型
+    //物料类型
     private String typeSid;
     //价值
     private String value;
     private String date;
     private String name;
-    //1:原料  2包装物
+    //1:物料  2包装物
     private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialinventoryrecord/RawMaterialInventoryRecordVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventoryrecord/MaterialInventoryRecordVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialinventoryrecord;
+package com.yxt.supervise.cyf.api.materialinventoryrecord;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料盘库记录信息 视图数据对象", description = "原料盘库记录信息 视图数据对象")
+@ApiModel(value = "物料盘库记录信息 视图数据对象", description = "物料盘库记录信息 视图数据对象")
-public class RawMaterialInventoryRecordVo implements Vo {
+public class MaterialInventoryRecordVo implements Vo {
     private String id;
     private String sid;
 
@@ -18,13 +18,15 @@ public class RawMaterialInventoryRecordVo implements Vo {
     private String inventoryDate;
     //盘库库存
     private String inventory;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
     //价值
     private String value;
-    //原料名称
+    //物料名称
     private String name;
-    //原料类名称
+    //物料类名称
     private String typeName;
+    //1 原料  2 包装物
+    private String type;
 
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialoutbound/RawMaterialOutbound.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutbound.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialoutbound;
+package com.yxt.supervise.cyf.api.materialoutbound;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
@@ -10,16 +10,16 @@ import lombok.Data;
  * @date 2023/5/4 14:26
  */
 @Data
-@ApiModel(value = "原料出库信息", description = "原料出库信息")
+@ApiModel(value = "物料出库信息", description = "物料出库信息")
-@TableName("raw_material_outbound")
+@TableName("material_outbound")
-public class RawMaterialOutbound extends BaseEntity {
+public class MaterialOutbound extends BaseEntity {
     //销售合同号
     private String salesContractNumber;
     //合同签订日期
     private String contractSigningDate;
     //出库日期
     private String deliveryDate;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
     //净重
     private double weight;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialoutbound/RawMaterialOutboundDetailsVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialoutbound;
+package com.yxt.supervise.cyf.api.materialoutbound;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料出库信息 视图数据详情", description = "原料出库信息 视图数据详情")
+@ApiModel(value = "物料出库信息 视图数据详情", description = "物料出库信息 视图数据详情")
-public class RawMaterialOutboundDetailsVo implements Vo {
+public class MaterialOutboundDetailsVo implements Vo {
     private String id;
     private String sid;
 
@@ -20,7 +20,7 @@ public class RawMaterialOutboundDetailsVo implements Vo {
     private String contractSigningDate;
     //出库日期
     private String deliveryDate;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
     //净重
     private double weight;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialoutbound/RawMaterialOutboundDto.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialoutbound;
+package com.yxt.supervise.cyf.api.materialoutbound;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料出库信息 数据传输对象", description = "原料出库信息 数据传输对象")
+@ApiModel(value = "物料出库信息 数据传输对象", description = "物料出库信息 数据传输对象")
-public class RawMaterialOutboundDto implements Dto {
+public class MaterialOutboundDto implements Dto {
     private String id;
     private String sid;
 
@@ -20,7 +20,7 @@ public class RawMaterialOutboundDto implements Dto {
     private String contractSigningDate;
     //出库日期
     private String deliveryDate;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
     //净重
     private double weight;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialoutbound/RawMaterialOutboundQuery.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialoutbound;
+package com.yxt.supervise.cyf.api.materialoutbound;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料出库信息 查询条件", description = "原料出库信息 查询条件")
+@ApiModel(value = "物料出库信息 查询条件", description = "物料出库信息 查询条件")
-public class RawMaterialOutboundQuery implements Query {
+public class MaterialOutboundQuery implements Query {
     private String id;
     private String sid;
 
@@ -20,7 +20,7 @@ public class RawMaterialOutboundQuery implements Query {
     private String contractSigningDate;
     //出库日期
     private String deliveryDate;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
     //净重
     private double weight;
@@ -28,6 +28,6 @@ public class RawMaterialOutboundQuery implements Query {
     private String value;
     private String date;
     private String  contractNumber;
-    //1:原料  2包装物
+    //1:物料  2包装物
     private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialoutbound/RawMaterialOutboundVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialoutbound/MaterialOutboundVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialoutbound;
+package com.yxt.supervise.cyf.api.materialoutbound;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -10,7 +10,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "油罐信息 视图数据对象", description = "油罐信息 视图数据对象")
-public class RawMaterialOutboundVo implements Vo {
+public class MaterialOutboundVo implements Vo {
     private String id;
     private String sid;
 
@@ -20,7 +20,7 @@ public class RawMaterialOutboundVo implements Vo {
     private String contractSigningDate;
     //出库日期
     private String deliveryDate;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
     private String typeName;
     //净重
@@ -28,6 +28,8 @@ public class RawMaterialOutboundVo implements Vo {
     private String name;
     //价值
     private String value;
-    //原料库存
+    //物料库存
     private double inventory;
+    //1 原料  2 包装物
+    private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialstorage/RawMaterialStorage.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialstorage;
+package com.yxt.supervise.cyf.api.materialstorage;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
@@ -10,9 +10,9 @@ import lombok.Data;
  * @date 2023/5/4 14:26
  */
 @Data
-@ApiModel(value = "原料入库信息", description = "原料入库信息")
+@ApiModel(value = "物料入库信息", description = "物料入库信息")
-@TableName("raw_material_storage")
+@TableName("material_storage")
-public class RawMaterialStorage extends BaseEntity {
+public class MaterialStorage extends BaseEntity {
     //合同号
     private String contractNumber;
     //供应商sid

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialstorage/RawMaterialStorageDetailsVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialstorage;
+package com.yxt.supervise.cyf.api.materialstorage;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料入库信息 视图数据详情", description = "原料入库信息 视图数据详情")
+@ApiModel(value = "物料入库信息 视图数据详情", description = "物料入库信息 视图数据详情")
-public class RawMaterialStorageDetailsVo implements Vo {
+public class MaterialStorageDetailsVo implements Vo {
     private String id;
     private String sid;
 

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialstorage/RawMaterialStorageDto.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialstorage;
+package com.yxt.supervise.cyf.api.materialstorage;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料入库信息 数据传输对象", description = "原料入库信息 数据传输对象")
+@ApiModel(value = "物料入库信息 数据传输对象", description = "物料入库信息 数据传输对象")
-public class RawMaterialStorageDto implements Dto {
+public class MaterialStorageDto implements Dto {
     private String id;
     private String sid;
 

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialstorage/RawMaterialStorageQuery.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialstorage;
+package com.yxt.supervise.cyf.api.materialstorage;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料入库信息 查询条件", description = "原料入库信息 查询条件")
+@ApiModel(value = "物料入库信息 查询条件", description = "物料入库信息 查询条件")
-public class RawMaterialStorageQuery implements Query {
+public class MaterialStorageQuery implements Query {
     private String id;
     private String sid;
 
@@ -33,6 +33,6 @@ public class RawMaterialStorageQuery implements Query {
     //油罐库存
     private double inventory=0;
     private String date;
-    //1:原料  2包装物
+    //1:物料  2包装物
     private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialstorage/RawMaterialStorageVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialstorage;
+package com.yxt.supervise.cyf.api.materialstorage;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,8 +9,8 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料入库信息 视图数据对象", description = "原料入库信息 视图数据对象")
+@ApiModel(value = "物料入库信息 视图数据对象", description = "物料入库信息 视图数据对象")
-public class RawMaterialStorageVo implements Vo {
+public class MaterialStorageVo implements Vo {
     private String id;
     private String sid;
 
@@ -22,9 +22,9 @@ public class RawMaterialStorageVo implements Vo {
     private String contractSigningDate;
     //发货车牌号
     private String licensePlateNumber;
-    //原料库存sid
+    //物料库存sid
     private String inventorySid;
-    //原料类型名称
+    //物料类型名称
     private String typeName;
     //净重
     private double weight;
@@ -34,6 +34,8 @@ public class RawMaterialStorageVo implements Vo {
     private String warehousingDate;
     //油罐库存
     private double inventory=0;
-    //原料名称
+    //物料名称
     private String name;
+    //1 原料  2 包装物
+    private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialType.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialType.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialtype;
+package com.yxt.supervise.cyf.api.materialtype;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
@@ -10,14 +10,14 @@ import lombok.Data;
  * @date 2023/5/4 14:26
  */
 @Data
-@ApiModel(value = "原料类型信息", description = "原料类型信息")
+@ApiModel(value = "物料类型信息", description = "物料类型信息")
 @TableName("raw_material_type")
-public class RawMaterialType extends BaseEntity {
+public class MaterialType extends BaseEntity {
-    //原料编号
+    //物料编号
     private String number;
-    //原料名称
+    //物料名称
     private String name;
-    //原料code
+    //物料code
     private String code;
 
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialTypeDetailsVo.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialtype;
+package com.yxt.supervise.cyf.api.materialtype;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -9,15 +9,15 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料类型信息 视图数据详情", description = "原料类型信息 视图数据详情")
+@ApiModel(value = "物料类型信息 视图数据详情", description = "物料类型信息 视图数据详情")
-public class RawMaterialTypeDetailsVo implements Vo {
+public class MaterialTypeDetailsVo implements Vo {
     private String id;
     private String sid;
 
-    //原料编号
+    //物料编号
     private String number;
-    //原料名称
+    //物料名称
     private String name;
-    //原料code
+    //物料code
     private String code;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialTypeDto.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeDto.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialtype;
+package com.yxt.supervise.cyf.api.materialtype;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -9,16 +9,16 @@ import lombok.Data;
  * @date 2023/5/4 14:28
  */
 @Data
-@ApiModel(value = "原料类型信息 数据传输对象", description = "原料类型信息 数据传输对象")
+@ApiModel(value = "物料类型信息 数据传输对象", description = "物料类型信息 数据传输对象")
-public class RawMaterialTypeDto implements Dto {
+public class MaterialTypeDto implements Dto {
     private String id;
     private String sid;
 
-    //原料编号
+    //物料编号
     private String number;
-    //原料名称
+    //物料名称
     private String name;
-    //原料code
+    //物料code
     private String code;
     //1 原料  2 包装物
     private String type;

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/rawmaterialtype/RawMaterialTypeQuery.java → yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.api.rawmaterialtype;
+package com.yxt.supervise.cyf.api.materialtype;
 
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
@@ -9,17 +9,17 @@ import lombok.Data;
  * @date 2023/5/4 14:29
  */
 @Data
-@ApiModel(value = "原料类型信息 查询条件", description = "原料类型信息 查询条件")
+@ApiModel(value = "物料类型信息 查询条件", description = "物料类型信息 查询条件")
-public class RawMaterialTypeQuery implements Query {
+public class MaterialTypeQuery implements Query {
     private String id;
     private String sid;
 
-    //原料编号
+    //物料编号
     private String number;
-    //原料名称
+    //物料名称
     private String name;
-    //原料code
+    //物料code
     private String code;
-    //1:原料  2包装物
+    //1:物料  2包装物
     private String type;
 }

yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialtype/MaterialTypeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.supervise.cyf.api.materialtype;
+
+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 MaterialTypeVo implements Vo {
+    private String id;
+    private String sid;
+
+    //物料编号
+    private String number;
+    //物料名称
+    private String name;
+    //物料code
+    private String code;
+    //1 原料  2 包装物
+    private String type;
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordRest.java

@@ -4,6 +4,8 @@ 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.crudeoilinventoryrecord.*;
+import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundQuery;
+import com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +21,13 @@ import org.springframework.web.bind.annotation.*;
 public class CrudeOilInventoryRecordRest {
     @Autowired
     CrudeOilInventoryRecordService CrudeOilInventoryRecordService;
-
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<CrudeOilInventoryRecordVo>> listPage(@RequestBody PagerQuery<CrudeOilInventoryRecordQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<CrudeOilInventoryRecordVo> pv = CrudeOilInventoryRecordService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
     @ApiOperation("新增")
     @PostMapping("/save")
     public ResultBean save (@RequestBody CrudeOilInventoryRecordDto dto){

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java

@@ -12,8 +12,10 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.cyf.api.crudeoilinventoryrecord.*;
 import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 
@@ -29,11 +31,18 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService<CrudeOilI
     public PagerVo<CrudeOilInventoryRecordVo> listPageVo(PagerQuery<CrudeOilInventoryRecordQuery> pq) {
         CrudeOilInventoryRecordQuery query = pq.getParams();
         QueryWrapper<CrudeOilInventoryRecord> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getDate())) {
+            qw.eq("STR_TO_DATE(c.recordDate,'%Y-%m-%d')", query.getDate());
+        }
+        if (StringUtils.isNotBlank(query.getNumber())) {
+            qw.like("t.number", query.getNumber());
+        }
         IPage<CrudeOilInventoryRecord> page = PagerUtil.queryToPage(pq);
         IPage<CrudeOilInventoryRecordVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<CrudeOilInventoryRecordVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    @Transactional
     public ResultBean save(CrudeOilInventoryRecordDto dto){
         ResultBean rb=new ResultBean();
         CrudeOilInventoryRecord entity=new CrudeOilInventoryRecord();

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java

@@ -22,6 +22,7 @@ import com.yxt.supervise.cyf.biz.tankinformation.TankInformationService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 
@@ -50,6 +51,7 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
         PagerVo<CrudeOilOutboundVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    @Transactional
     public ResultBean save(CrudeOilOutboundDto dto){
         ResultBean rb=new ResultBean();
         CrudeOilOutbound entity=new CrudeOilOutbound();

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java

@@ -17,6 +17,7 @@ import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author wangpengfei
@@ -41,6 +42,7 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
         PagerVo<CrudeOilStorageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    @Transactional
     public ResultBean save(CrudeOilStorageDto dto){
         ResultBean rb=new ResultBean();
         CrudeOilStorage entity=new CrudeOilStorage();

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.cyf.biz.materialinventory;
+
+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.materialinventory.MaterialInventory;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo;
+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 MaterialInventoryMapper extends BaseMapper<MaterialInventory> {
+    IPage<MaterialInventoryVo> selectPageVo(IPage<MaterialInventory> page, @Param(Constants.WRAPPER) Wrapper<MaterialInventory> qw);
+    @Select("        SELECT" +
+            "        *,t.name as typeName" +
+            "        FROM" +
+            "        material_inventory r" +
+            "        left join material_type t on t.sid=r.typeSid ")
+    List<MaterialInventoryVo> inventoryList();
+    @Select("select * from material_inventory where sid=#{sid}")
+    MaterialInventory getInventoryBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventory/RawMaterialInventoryMapper.xml → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryMapper.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.cyf.biz.rawmaterialinventory.RawMaterialInventoryMapper">
+<mapper namespace="com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryVo">
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo">
         SELECT
         *,t.name as typeName
         FROM
-        raw_material_inventory r
+        material_inventory r
-        left join raw_material_type t on t.sid=r.typeSid
+        left join material_type t on t.sid=r.typeSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventory/RawMaterialInventoryRest.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryRest.java

@@ -1,11 +1,11 @@
-package com.yxt.supervise.cyf.biz.rawmaterialinventory;
+package com.yxt.supervise.cyf.biz.materialinventory;
 
 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.rawmaterialinventory.RawMaterialInventoryDto;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryDto;
-import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryQuery;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryQuery;
-import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryVo;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,35 +17,35 @@ import java.util.List;
  * @author wangpengfei
  * @date 2023/5/4 14:38
  */
-@Api(tags = "原料料库存信息")
+@Api(tags = "物料料库存信息")
 @RestController
 @RequestMapping("cyf/rawinventory")
-public class RawMaterialInventoryRest {
+public class MaterialInventoryRest {
     @Autowired
-    RawMaterialInventoryService RawMaterialInventoryService;
+    MaterialInventoryService RawMaterialInventoryService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<RawMaterialInventoryVo>> listPage(@RequestBody PagerQuery<RawMaterialInventoryQuery> pq) {
+    public ResultBean<PagerVo<MaterialInventoryVo>> listPage(@RequestBody PagerQuery<MaterialInventoryQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        PagerVo<RawMaterialInventoryVo> pv = RawMaterialInventoryService.listPageVo(pq);
+        PagerVo<MaterialInventoryVo> pv = RawMaterialInventoryService.listPageVo(pq);
         return rb.success().setData(pv);
     }
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/inventoryList")
-    public ResultBean<PagerVo<RawMaterialInventoryVo>> inventoryList() {
+    public ResultBean<PagerVo<MaterialInventoryVo>> inventoryList() {
         ResultBean rb = ResultBean.fireFail();
-        List<RawMaterialInventoryVo> pv = RawMaterialInventoryService.inventoryList();
+        List<MaterialInventoryVo> pv = RawMaterialInventoryService.inventoryList();
         return rb.success().setData(pv);
     }
     @ApiOperation("新增")
     @PostMapping("/save")
-    public ResultBean save (@RequestBody RawMaterialInventoryDto dto){
+    public ResultBean save (@RequestBody MaterialInventoryDto dto){
         return RawMaterialInventoryService.save(dto);
     }
     @ApiOperation("修改")
     @PostMapping("/update")
-    public ResultBean update (@RequestBody RawMaterialInventoryDto dto){
+    public ResultBean update (@RequestBody MaterialInventoryDto dto){
         return RawMaterialInventoryService.update(dto);
     }
     @ApiOperation("根据sid查询")

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventory/RawMaterialInventoryService.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventory/MaterialInventoryService.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.biz.rawmaterialinventory;
+package com.yxt.supervise.cyf.biz.materialinventory;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,10 +9,10 @@ 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.rawmaterialinventory.RawMaterialInventory;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory;
-import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryDto;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryDto;
-import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryQuery;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryQuery;
-import com.yxt.supervise.cyf.api.rawmaterialinventory.RawMaterialInventoryVo;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,51 +22,51 @@ import java.util.List;
  * @date 2023/5/4 14:37
  */
 @Service
-public class RawMaterialInventoryService extends MybatisBaseService<RawMaterialInventoryMapper, RawMaterialInventory> {
+public class MaterialInventoryService extends MybatisBaseService<MaterialInventoryMapper, MaterialInventory> {
 
 
-    public PagerVo<RawMaterialInventoryVo> listPageVo(PagerQuery<RawMaterialInventoryQuery> pq) {
+    public PagerVo<MaterialInventoryVo> listPageVo(PagerQuery<MaterialInventoryQuery> pq) {
-        RawMaterialInventoryQuery query = pq.getParams();
+        MaterialInventoryQuery query = pq.getParams();
-        QueryWrapper<RawMaterialInventory> qw = new QueryWrapper<>();
+        QueryWrapper<MaterialInventory> qw = new QueryWrapper<>();
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("r.name",query.getName());
         }
         if(StringUtils.isNotBlank(query.getType())){
             qw.like("r.type",query.getType());
         }
-        IPage<RawMaterialInventory> page = PagerUtil.queryToPage(pq);
+        IPage<MaterialInventory> page = PagerUtil.queryToPage(pq);
-        IPage<RawMaterialInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<MaterialInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<RawMaterialInventoryVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<MaterialInventoryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<RawMaterialInventoryVo> inventoryList() {
+    public List<MaterialInventoryVo> inventoryList() {
 
         return baseMapper.inventoryList();
     }
-    public ResultBean save(RawMaterialInventoryDto dto){
+    public ResultBean save(MaterialInventoryDto dto){
         ResultBean rb=new ResultBean();
-        RawMaterialInventory entity=new RawMaterialInventory();
+        MaterialInventory entity=new MaterialInventory();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setInventory(dto.getInitialInventory());
         baseMapper.insert(entity);
         return rb.success().setMsg("新增成功");
     }
-    public ResultBean update (RawMaterialInventoryDto dto){
+    public ResultBean update (MaterialInventoryDto dto){
         ResultBean rb=new ResultBean();
         String dtoSid = dto.getSid();
-        RawMaterialInventory entity=fetchBySid(dtoSid);
+        MaterialInventory 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();
-        RawMaterialInventory RawMaterialInventory=baseMapper.getInventoryBySid(sid);
+        MaterialInventory RawMaterialInventory=baseMapper.getInventoryBySid(sid);
         return  rb.success().setData(RawMaterialInventory);
     }
     public ResultBean del(String sid){
         ResultBean rb=new ResultBean();
-        baseMapper.delete(new QueryWrapper<RawMaterialInventory>().eq("sid",sid));
+        baseMapper.delete(new QueryWrapper<MaterialInventory>().eq("sid",sid));
         return rb.success().setMsg("删除成功");
     }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.cyf.biz.materialinventoryrecord;
+
+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.materialinventoryrecord.MaterialInventoryRecord;
+import com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Mapper
+public interface MaterialInventoryRecordMapper extends BaseMapper<MaterialInventoryRecord> {
+    IPage<MaterialInventoryRecordVo> selectPageVo(IPage<MaterialInventoryRecord> page, @Param(Constants.WRAPPER) Wrapper<MaterialInventoryRecord> qw);
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialinventoryrecord/RawMaterialInventoryRecordMapper.xml → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordMapper.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.cyf.biz.rawmaterialinventoryrecord.RawMaterialInventoryRecordMapper">
+<mapper namespace="com.yxt.supervise.cyf.biz.materialinventoryrecord.MaterialInventoryRecordMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.rawmaterialinventoryrecord.RawMaterialInventoryRecordVo">
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo">
         SELECT
         *,i.name as name,i.inventory as inventory,t.name as typeName;
         FROM
-        raw_material_inventory_record r
+        material_inventory_record r
-        left join raw_material_inventory i on r.inventorySid =i.sid
+        left join material_inventory i on r.inventorySid =i.sid
-        left join raw_material_type t on t.sid=i.typeSid
+        left join material_type t on t.sid=i.typeSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordRest.java

@@ -0,0 +1,39 @@
+package com.yxt.supervise.cyf.biz.materialinventoryrecord;
+
+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.materialinventoryrecord.MaterialInventoryRecordDto;
+import com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordQuery;
+import com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:38
+ */
+@Api(tags = "盘库信息")
+@RestController
+@RequestMapping("cyf/rawrecord")
+public class MaterialInventoryRecordRest {
+    @Autowired
+    MaterialInventoryRecordService RawMaterialInventoryRecordService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<MaterialInventoryRecordVo>> listPage(@RequestBody PagerQuery<MaterialInventoryRecordQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<MaterialInventoryRecordVo> pv = RawMaterialInventoryRecordService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save (@RequestBody MaterialInventoryRecordDto dto){
+        return RawMaterialInventoryRecordService.save(dto);
+    }
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialinventoryrecord/MaterialInventoryRecordService.java

@@ -0,0 +1,52 @@
+package com.yxt.supervise.cyf.biz.materialinventoryrecord;
+
+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.materialinventoryrecord.MaterialInventoryRecord;
+import com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordDto;
+import com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordQuery;
+import com.yxt.supervise.cyf.api.materialinventoryrecord.MaterialInventoryRecordVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author wangpengfei
+ * @date 2023/5/4 14:37
+ */
+@Service
+public class MaterialInventoryRecordService extends MybatisBaseService<MaterialInventoryRecordMapper, MaterialInventoryRecord> {
+
+
+    public PagerVo<MaterialInventoryRecordVo> listPageVo(PagerQuery<MaterialInventoryRecordQuery> pq) {
+        MaterialInventoryRecordQuery query = pq.getParams();
+        QueryWrapper<MaterialInventoryRecord> 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());
+        }
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("r.type", query.getType());
+        }
+        IPage<MaterialInventoryRecord> page = PagerUtil.queryToPage(pq);
+        IPage<MaterialInventoryRecordVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<MaterialInventoryRecordVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean save(MaterialInventoryRecordDto dto){
+        ResultBean rb=new ResultBean();
+        MaterialInventoryRecord entity=new MaterialInventoryRecord();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setMsg("新增成功");
+    }
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.java

@@ -0,0 +1,31 @@
+package com.yxt.supervise.cyf.biz.materialoutbound;
+
+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.materialoutbound.MaterialOutbound;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo;
+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 MaterialOutboundMapper extends BaseMapper<MaterialOutbound> {
+    IPage<MaterialOutboundVo> selectPageVo(IPage<MaterialOutbound> page, @Param(Constants.WRAPPER) Wrapper<MaterialOutbound> qw);
+    @Select("        SELECT" +
+            "        *,t.name as typeName,i.inventory as inventory" +
+            "        FROM" +
+            "        material_outbound o" +
+            "        left join material_inventory i on i.sid=o.inventorySid" +
+            "        left join material_type t on t.sid=i.typeSid")
+    List<MaterialOutboundVo> outboundList();
+    @Select("select * from tank_information where sid=#{sid}")
+    MaterialOutbound getOutboundBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialstorage/RawMaterialStorageMapper.xml → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundMapper.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.cyf.biz.rawmaterialstorage.RawMaterialStorageMapper">
+<mapper namespace="com.yxt.supervise.cyf.biz.materialoutbound.MaterialOutboundMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageVo">
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo">
         SELECT
         *,t.name as typeName,i.inventory as inventory
         FROM
-        raw_material_storage s
+        material_outbound o
-        left join raw_material_inventory i on i.sid=s.inventorySid
+        left join material_inventory i on i.sid=o.inventorySid
-        left join raw_material_type t on t.sid=i.typeSid
+        left join material_type t on t.sid=i.typeSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialoutbound/RawMaterialOutboundRest.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundRest.java

@@ -1,11 +1,11 @@
-package com.yxt.supervise.cyf.biz.rawmaterialoutbound;
+package com.yxt.supervise.cyf.biz.materialoutbound;
 
 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.rawmaterialoutbound.RawMaterialOutboundDto;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundDto;
-import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundQuery;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundQuery;
-import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundVo;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,27 +20,27 @@ import java.util.List;
 @Api(tags = "出库信息")
 @RestController
 @RequestMapping("cyf/rawoutbound")
-public class RawMaterialOutboundRest {
+public class MaterialOutboundRest {
     @Autowired
-    RawMaterialOutboundService RawMaterialOutboundService;
+    MaterialOutboundService RawMaterialOutboundService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<RawMaterialOutboundVo>> listPage(@RequestBody PagerQuery<RawMaterialOutboundQuery> pq) {
+    public ResultBean<PagerVo<MaterialOutboundVo>> listPage(@RequestBody PagerQuery<MaterialOutboundQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        PagerVo<RawMaterialOutboundVo> pv = RawMaterialOutboundService.listPageVo(pq);
+        PagerVo<MaterialOutboundVo> pv = RawMaterialOutboundService.listPageVo(pq);
         return rb.success().setData(pv);
     }
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/outboundList")
-    public ResultBean<PagerVo<RawMaterialOutboundVo>> outboundList() {
+    public ResultBean<PagerVo<MaterialOutboundVo>> outboundList() {
         ResultBean rb = ResultBean.fireFail();
-        List<RawMaterialOutboundVo> pv = RawMaterialOutboundService.outboundList();
+        List<MaterialOutboundVo> pv = RawMaterialOutboundService.outboundList();
         return rb.success().setData(pv);
     }
     @ApiOperation("新增")
     @PostMapping("/save")
-    public ResultBean save (@RequestBody RawMaterialOutboundDto dto){
+    public ResultBean save (@RequestBody MaterialOutboundDto dto){
         return RawMaterialOutboundService.save(dto);
     }
 

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialoutbound/RawMaterialOutboundService.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialoutbound/MaterialOutboundService.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.biz.rawmaterialoutbound;
+package com.yxt.supervise.cyf.biz.materialoutbound;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -9,12 +9,12 @@ 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.rawmaterialinventory.RawMaterialInventory;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory;
-import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutbound;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutbound;
-import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundDto;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundDto;
-import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundQuery;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundQuery;
-import com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundVo;
+import com.yxt.supervise.cyf.api.materialoutbound.MaterialOutboundVo;
-import com.yxt.supervise.cyf.biz.rawmaterialinventory.RawMaterialInventoryMapper;
+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;
@@ -27,13 +27,13 @@ import java.util.List;
  * @date 2023/5/4 14:37
  */
 @Service
-public class RawMaterialOutboundService extends MybatisBaseService<RawMaterialOutboundMapper, RawMaterialOutbound> {
+public class MaterialOutboundService extends MybatisBaseService<MaterialOutboundMapper, MaterialOutbound> {
 
     @Autowired
-    RawMaterialInventoryMapper rawMaterialInventoryMapper;
+    MaterialInventoryMapper rawMaterialInventoryMapper;
-    public PagerVo<RawMaterialOutboundVo> listPageVo(PagerQuery<RawMaterialOutboundQuery> pq) {
+    public PagerVo<MaterialOutboundVo> listPageVo(PagerQuery<MaterialOutboundQuery> pq) {
-        RawMaterialOutboundQuery query = pq.getParams();
+        MaterialOutboundQuery query = pq.getParams();
-        QueryWrapper<RawMaterialOutbound> qw = new QueryWrapper<>();
+        QueryWrapper<MaterialOutbound> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getDate())) {
             qw.eq("STR_TO_DATE(o.deliverDate,'%Y-%m-%d')", query.getDate());
         }
@@ -43,24 +43,24 @@ public class RawMaterialOutboundService extends MybatisBaseService<RawMaterialOu
         if (StringUtils.isNotBlank(query.getType())) {
             qw.eq("o.type", query.getType());
         }
-        IPage<RawMaterialOutbound> page = PagerUtil.queryToPage(pq);
+        IPage<MaterialOutbound> page = PagerUtil.queryToPage(pq);
-        IPage<RawMaterialOutboundVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<MaterialOutboundVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<RawMaterialOutboundVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<MaterialOutboundVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<RawMaterialOutboundVo> outboundList() {
+    public List<MaterialOutboundVo> outboundList() {
 
         return baseMapper.outboundList();
     }
-    public ResultBean save(RawMaterialOutboundDto dto){
+    public ResultBean save(MaterialOutboundDto dto){
         ResultBean rb=new ResultBean();
-        RawMaterialOutbound entity=new RawMaterialOutbound();
+        MaterialOutbound entity=new MaterialOutbound();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setDeliveryDate(dfmt);
         baseMapper.insert(entity);
-        RawMaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<RawMaterialInventory>().eq("sid",dto.getInventorySid()));
+        MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<MaterialInventory>().eq("sid",dto.getInventorySid()));
         rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()-dto.getWeight());
         rawMaterialInventoryMapper.updateById(rawMaterialInventory);
         return rb.success().setMsg("新增成功");
@@ -68,7 +68,7 @@ public class RawMaterialOutboundService extends MybatisBaseService<RawMaterialOu
 
     public ResultBean getOutboundBySid(String sid){
         ResultBean rb=new ResultBean();
-        RawMaterialOutbound RawMaterialOutbound=baseMapper.getOutboundBySid(sid);
+        MaterialOutbound RawMaterialOutbound=baseMapper.getOutboundBySid(sid);
         return  rb.success().setData(RawMaterialOutbound);
     }
 

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.java

@@ -0,0 +1,30 @@
+package com.yxt.supervise.cyf.biz.materialstorage;
+
+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.materialstorage.MaterialStorage;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo;
+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 MaterialStorageMapper extends BaseMapper<MaterialStorage> {
+    IPage<MaterialStorageVo> selectPageVo(IPage<MaterialStorage> page, @Param(Constants.WRAPPER) Wrapper<MaterialStorage> qw);
+    @Select("        *,t.name as typeName,i.inventory as inventory" +
+            "        FROM" +
+            "        material_storage s" +
+            "        left join material_inventory i on i.sid=s.inventorySid" +
+            "        left join material_type t on t.sid=i.typeSid")
+    List<MaterialStorageVo> StorageList();
+    @Select("select * from material_storage where sid=#{sid}")
+    MaterialStorage getStorageBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialoutbound/RawMaterialOutboundMapper.xml → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.cyf.biz.rawmaterialoutbound.RawMaterialOutboundMapper">
+<mapper namespace="com.yxt.supervise.cyf.biz.materialstorage.MaterialStorageMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.rawmaterialoutbound.RawMaterialOutboundVo">
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo">
         SELECT
         *,t.name as typeName,i.inventory as inventory
         FROM
-        raw_material_outbound o
+        material_storage s
-        left join raw_material_inventory i on i.sid=o.inventorySid
+        left join material_inventory i on i.sid=s.inventorySid
-        left join raw_material_type t on t.sid=i.typeSid
+        left join material_type t on t.sid=i.typeSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialstorage/RawMaterialStorageRest.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageRest.java

@@ -1,11 +1,11 @@
-package com.yxt.supervise.cyf.biz.rawmaterialstorage;
+package com.yxt.supervise.cyf.biz.materialstorage;
 
 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.rawmaterialstorage.RawMaterialStorageDto;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageDto;
-import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageQuery;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageQuery;
-import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageVo;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,27 +20,27 @@ import java.util.List;
 @Api(tags = "入库消息")
 @RestController
 @RequestMapping("cyf/rawstorage")
-public class RawMaterialStorageRest {
+public class MaterialStorageRest {
     @Autowired
-    RawMaterialStorageService RawMaterialStorageService;
+    MaterialStorageService RawMaterialStorageService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<RawMaterialStorageVo>> listPage(@RequestBody PagerQuery<RawMaterialStorageQuery> pq) {
+    public ResultBean<PagerVo<MaterialStorageVo>> listPage(@RequestBody PagerQuery<MaterialStorageQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        PagerVo<RawMaterialStorageVo> pv = RawMaterialStorageService.listPageVo(pq);
+        PagerVo<MaterialStorageVo> pv = RawMaterialStorageService.listPageVo(pq);
         return rb.success().setData(pv);
     }
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/tankList")
-    public ResultBean<PagerVo<RawMaterialStorageVo>> listPage() {
+    public ResultBean<PagerVo<MaterialStorageVo>> listPage() {
         ResultBean rb = ResultBean.fireFail();
-        List<RawMaterialStorageVo> pv = RawMaterialStorageService.StorageList();
+        List<MaterialStorageVo> pv = RawMaterialStorageService.StorageList();
         return rb.success().setData(pv);
     }
     @ApiOperation("新增")
     @PostMapping("/save")
-    public ResultBean save (@RequestBody RawMaterialStorageDto dto){
+    public ResultBean save (@RequestBody MaterialStorageDto dto){
         return RawMaterialStorageService.save(dto);
     }
 

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialstorage/RawMaterialStorageService.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.biz.rawmaterialstorage;
+package com.yxt.supervise.cyf.biz.materialstorage;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -9,12 +9,12 @@ 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.rawmaterialinventory.RawMaterialInventory;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventory;
-import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorage;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorage;
-import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageDto;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageDto;
-import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageQuery;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageQuery;
-import com.yxt.supervise.cyf.api.rawmaterialstorage.RawMaterialStorageVo;
+import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo;
-import com.yxt.supervise.cyf.biz.rawmaterialinventory.RawMaterialInventoryMapper;
+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;
@@ -27,15 +27,15 @@ import java.util.List;
  * @date 2023/5/4 14:37
  */
 @Service
-public class RawMaterialStorageService extends MybatisBaseService<RawMaterialStorageMapper, RawMaterialStorage> {
+public class MaterialStorageService extends MybatisBaseService<MaterialStorageMapper, MaterialStorage> {
 
     @Autowired
-    RawMaterialInventoryMapper rawMaterialInventoryMapper;
+    MaterialInventoryMapper rawMaterialInventoryMapper;
-    public PagerVo<RawMaterialStorageVo> listPageVo(PagerQuery<RawMaterialStorageQuery> pq) {
+    public PagerVo<MaterialStorageVo> listPageVo(PagerQuery<MaterialStorageQuery> pq) {
-        RawMaterialStorageQuery query = pq.getParams();
+        MaterialStorageQuery query = pq.getParams();
-        QueryWrapper<RawMaterialStorage> qw = new QueryWrapper<>();
+        QueryWrapper<MaterialStorage> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getDate())) {
-            qw.eq("STR_TO_DATE(s.deliverDate,'%Y-%m-%d')", 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());
@@ -43,23 +43,23 @@ public class RawMaterialStorageService extends MybatisBaseService<RawMaterialSto
         if (StringUtils.isNotBlank(query.getType())) {
             qw.eq("s.type", query.getType());
         }
-        IPage<RawMaterialStorage> page = PagerUtil.queryToPage(pq);
+        IPage<MaterialStorage> page = PagerUtil.queryToPage(pq);
-        IPage<RawMaterialStorageVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<MaterialStorageVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<RawMaterialStorageVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<MaterialStorageVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<RawMaterialStorageVo> StorageList() {
+    public List<MaterialStorageVo> StorageList() {
         return baseMapper.StorageList();
     }
-    public ResultBean save(RawMaterialStorageDto dto){
+    public ResultBean save(MaterialStorageDto dto){
         ResultBean rb=new ResultBean();
-        RawMaterialStorage entity=new RawMaterialStorage();
+        MaterialStorage entity=new MaterialStorage();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         entity.setWarehousingDate(dfmt);
         baseMapper.insert(entity);
-        RawMaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<RawMaterialInventory>().eq("sid",dto.getInventorySid()));
+        MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<MaterialInventory>().eq("sid",dto.getInventorySid()));
         rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()+dto.getWeight());
         rawMaterialInventoryMapper.updateById(rawMaterialInventory);
         return rb.success().setMsg("新增成功");
@@ -67,7 +67,7 @@ public class RawMaterialStorageService extends MybatisBaseService<RawMaterialSto
 
     public ResultBean getTankBySid(String sid){
         ResultBean rb=new ResultBean();
-        RawMaterialStorage RawMaterialStorage=baseMapper.getStorageBySid(sid);
+        MaterialStorage RawMaterialStorage=baseMapper.getStorageBySid(sid);
         return  rb.success().setData(RawMaterialStorage);
     }
 

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.java

@@ -0,0 +1,26 @@
+package com.yxt.supervise.cyf.biz.materialtype;
+
+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.materialtype.MaterialType;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeVo;
+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 MaterialTypeMapper extends BaseMapper<MaterialType> {
+    IPage<MaterialTypeVo> selectPageVo(IPage<MaterialType> page, @Param(Constants.WRAPPER) Wrapper<MaterialType> qw);
+    @Select("select * from material_type")
+    List<MaterialTypeVo> typeList();
+    @Select("select * from material_type where sid=#{sid}")
+    MaterialType getTypeBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialtype/RawMaterialTypeMapper.xml → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.supervise.cyf.biz.rawmaterialtype.RawMaterialTypeMapper">
+<mapper namespace="com.yxt.supervise.cyf.biz.materialtype.MaterialTypeMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeVo">
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.materialtype.MaterialTypeVo">
         SELECT
         *
         FROM
-        raw_material_type
+        material_type
         <where>
             ${ew.sqlSegment}
         </where>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialtype/RawMaterialTypeRest.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeRest.java

@@ -1,11 +1,11 @@
-package com.yxt.supervise.cyf.biz.rawmaterialtype;
+package com.yxt.supervise.cyf.biz.materialtype;
 
 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.rawmaterialtype.RawMaterialTypeDto;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeDto;
-import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeQuery;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeQuery;
-import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeVo;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,35 +17,35 @@ import java.util.List;
  * @author wangpengfei
  * @date 2023/5/4 14:38
  */
-@Api(tags = "原料类型信息")
+@Api(tags = "物料类型信息")
 @RestController
 @RequestMapping("cyf/rawtype")
-public class RawMaterialTypeRest {
+public class MaterialTypeRest {
     @Autowired
-    RawMaterialTypeService RawMaterialTypeService;
+    MaterialTypeService RawMaterialTypeService;
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-    public ResultBean<PagerVo<RawMaterialTypeVo>> listPage(@RequestBody PagerQuery<RawMaterialTypeQuery> pq) {
+    public ResultBean<PagerVo<MaterialTypeVo>> listPage(@RequestBody PagerQuery<MaterialTypeQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
-        PagerVo<RawMaterialTypeVo> pv = RawMaterialTypeService.listPageVo(pq);
+        PagerVo<MaterialTypeVo> pv = RawMaterialTypeService.listPageVo(pq);
         return rb.success().setData(pv);
     }
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/typeList")
-    public ResultBean<PagerVo<RawMaterialTypeVo>> typeList() {
+    public ResultBean<PagerVo<MaterialTypeVo>> typeList() {
         ResultBean rb = ResultBean.fireFail();
-        List<RawMaterialTypeVo> pv = RawMaterialTypeService.typeList();
+        List<MaterialTypeVo> pv = RawMaterialTypeService.typeList();
         return rb.success().setData(pv);
     }
     @ApiOperation("新增")
     @PostMapping("/save")
-    public ResultBean save (@RequestBody RawMaterialTypeDto dto){
+    public ResultBean save (@RequestBody MaterialTypeDto dto){
         return RawMaterialTypeService.save(dto);
     }
     @ApiOperation("修改")
     @PostMapping("/update")
-    public ResultBean update (@RequestBody RawMaterialTypeDto dto){
+    public ResultBean update (@RequestBody MaterialTypeDto dto){
         return RawMaterialTypeService.update(dto);
     }
     @ApiOperation("根据sid查询")

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/rawmaterialtype/RawMaterialTypeService.java → yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialtype/MaterialTypeService.java

@@ -1,4 +1,4 @@
-package com.yxt.supervise.cyf.biz.rawmaterialtype;
+package com.yxt.supervise.cyf.biz.materialtype;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,10 +9,10 @@ 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.rawmaterialtype.RawMaterialType;
+import com.yxt.supervise.cyf.api.materialtype.MaterialType;
-import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeDto;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeDto;
-import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeQuery;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeQuery;
-import com.yxt.supervise.cyf.api.rawmaterialtype.RawMaterialTypeVo;
+import com.yxt.supervise.cyf.api.materialtype.MaterialTypeVo;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,49 +22,49 @@ import java.util.List;
  * @date 2023/5/4 14:37
  */
 @Service
-public class RawMaterialTypeService extends MybatisBaseService<RawMaterialTypeMapper, RawMaterialType> {
+public class MaterialTypeService extends MybatisBaseService<MaterialTypeMapper, MaterialType> {
 
 
-    public PagerVo<RawMaterialTypeVo> listPageVo(PagerQuery<RawMaterialTypeQuery> pq) {
+    public PagerVo<MaterialTypeVo> listPageVo(PagerQuery<MaterialTypeQuery> pq) {
-        RawMaterialTypeQuery query = pq.getParams();
+        MaterialTypeQuery query = pq.getParams();
-        QueryWrapper<RawMaterialType> qw = new QueryWrapper<>();
+        QueryWrapper<MaterialType> qw = new QueryWrapper<>();
         if(StringUtils.isNotBlank(query.getName())){
             qw.like("name",query.getName());
         }
         if(StringUtils.isNotBlank(query.getType())){
             qw.like("type",query.getType());
         }
-        IPage<RawMaterialType> page = PagerUtil.queryToPage(pq);
+        IPage<MaterialType> page = PagerUtil.queryToPage(pq);
-        IPage<RawMaterialTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<MaterialTypeVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<RawMaterialTypeVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<MaterialTypeVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<RawMaterialTypeVo> typeList() {
+    public List<MaterialTypeVo> typeList() {
         return baseMapper.typeList();
     }
-    public ResultBean save(RawMaterialTypeDto dto){
+    public ResultBean save(MaterialTypeDto dto){
         ResultBean rb=new ResultBean();
-        RawMaterialType entity=new RawMaterialType();
+        MaterialType entity=new MaterialType();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
         return rb.success().setMsg("新增成功");
     }
-    public ResultBean update (RawMaterialTypeDto dto){
+    public ResultBean update (MaterialTypeDto dto){
         ResultBean rb=new ResultBean();
         String dtoSid = dto.getSid();
-        RawMaterialType entity=fetchBySid(dtoSid);
+        MaterialType 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();
-        RawMaterialType RawMaterialType=baseMapper.getTypeBySid(sid);
+        MaterialType RawMaterialType=baseMapper.getTypeBySid(sid);
         return  rb.success().setData(RawMaterialType);
     }
     public ResultBean del(String sid){
         ResultBean rb=new ResultBean();
-        baseMapper.delete(new QueryWrapper<RawMaterialType>().eq("sid",sid));
+        baseMapper.delete(new QueryWrapper<MaterialType>().eq("sid",sid));
         return rb.success().setMsg("删除成功");
     }
 }