包装物

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;

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;
+
 }

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;
 }

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;
 }

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;
+
 }

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;
+
 
 }

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;
+
 }

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;
 }

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;
+
 }

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;
 }

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;
 }

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;
+
 
 }

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;
     //油罐库存

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;
+
 }

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;
+
 }

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;
+
 }

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+}

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;
+
+}

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;
+}

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
+}

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<MaterialI
         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);

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<MaterialOutbound
         if (StringUtils.isNotBlank(query.getContractNumber())) {
             qw.like("o.salesContractNumber", query.getContractNumber());
         }
-        if (StringUtils.isNotBlank(query.getType())) {
-            qw.eq("o.type", query.getType());
-        }
+
         IPage<MaterialOutbound> page = PagerUtil.queryToPage(pq);
         IPage<MaterialOutboundVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<MaterialOutboundVo> p = PagerUtil.pageToVo(pagging, null);

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<MaterialStorageMa
         if (StringUtils.isNotBlank(query.getContractNumber())) {
             qw.like("s.salesContractNumber", query.getContractNumber());
         }
-        if (StringUtils.isNotBlank(query.getType())) {
-            qw.eq("s.type", query.getType());
-        }
+
         IPage<MaterialStorage> page = PagerUtil.queryToPage(pq);
         IPage<MaterialStorageVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<MaterialStorageVo> p = PagerUtil.pageToVo(pagging, null);

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<MaterialType> {
     IPage<MaterialTypeVo> selectPageVo(IPage<MaterialType> page, @Param(Constants.WRAPPER) Wrapper<MaterialType> qw);
-    @Select("select * from material_type where type=#{type}")
-    List<MaterialTypeVo> typeList(@Param("type") String type);
+    @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/materialtype/MaterialTypeRest.java

@@ -33,9 +33,9 @@ public class MaterialTypeRest {
     }
     @ApiOperation("根据物料类型查询数据的列表")
     @PostMapping("/typeList")
-    public ResultBean<PagerVo<MaterialTypeVo>> typeList(String type) {
+    public ResultBean<PagerVo<MaterialTypeVo>> typeList() {
         ResultBean rb = ResultBean.fireFail();
-        List<MaterialTypeVo> pv = RawMaterialTypeService.typeList(type);
+        List<MaterialTypeVo> pv = RawMaterialTypeService.typeList();
         return rb.success().setData(pv);
     }
     @ApiOperation("新增")

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<MaterialTypeMapper,
         PagerVo<MaterialTypeVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public List<MaterialTypeVo> typeList(String type) {
-        return baseMapper.typeList(type);
+    public List<MaterialTypeVo> typeList() {
+        return baseMapper.typeList();
     }
     public ResultBean save(MaterialTypeDto dto){
         ResultBean rb=new ResultBean();

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<PackagingInventory> {
+    IPage<PackagingInventoryVo> selectPageVo(IPage<PackagingInventory> page, @Param(Constants.WRAPPER) Wrapper<PackagingInventory> qw);
+    @Select("        SELECT" +
+            "        *,t.name as typeName" +
+            "        FROM" +
+            "        packaging_inventory r" +
+            "        left join packaging_type t on t.sid=r.typeSid ")
+    List<PackagingInventoryVo> inventoryList();
+    @Select("select * from packaging_inventory where sid=#{sid}")
+    PackagingInventory getInventoryBySid(@Param("sid")String sid);
+    @Select("select * from packaging_inventory where typeSid=#{sid}")
+    List<PackagingInventory> getInventory(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventory/PackagingInventoryMapper.xml

@@ -0,0 +1,17 @@
+<?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.packaginginventory.PackagingInventoryMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventory.PackagingInventoryVo">
+        SELECT
+        *,t.name as typeName
+        FROM
+        packaging_inventory r
+        left join packaging_type t on t.sid=r.typeSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

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<PagerVo<PackagingInventoryVo>> listPage(@RequestBody PagerQuery<PackagingInventoryQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PackagingInventoryVo> pv = packagingPackagingInventoryService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/inventoryList")
+    public ResultBean<PagerVo<PackagingInventoryVo>> inventoryList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<PackagingInventoryVo> 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);
+    }
+}

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<PackagingInventoryMapper, PackagingInventory> {
+
+
+    public PagerVo<PackagingInventoryVo> listPageVo(PagerQuery<PackagingInventoryQuery> pq) {
+        PackagingInventoryQuery query = pq.getParams();
+        QueryWrapper<PackagingInventory> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getName())){
+            qw.like("r.name",query.getName());
+        }
+        IPage<PackagingInventory> page = PagerUtil.queryToPage(pq);
+        IPage<PackagingInventoryVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PackagingInventoryVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PackagingInventoryVo> 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<PackagingInventory> RawPackagingInventory=baseMapper.getInventory(sid);
+        return  rb.success().setData(RawPackagingInventory);
+    }
+    public ResultBean del(String sid){
+        ResultBean rb=new ResultBean();
+        baseMapper.delete(new QueryWrapper<PackagingInventory>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+}

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<PackagingInventoryRecord> {
+    IPage<PackagingInventoryRecordVo> selectPageVo(IPage<PackagingInventoryRecord> page, @Param(Constants.WRAPPER) Wrapper<PackagingInventoryRecord> qw);
+
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml

@@ -0,0 +1,18 @@
+<?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.packaginginventoryrecord.PackagingInventoryRecordMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packaginginventoryrecord.PackagingInventoryRecordVo">
+        SELECT
+        *,i.name as name,i.inventory as inventory,t.name as typeName;
+        FROM
+        packaging_inventory_record r
+        left join packaging_inventory i on r.inventorySid =i.sid
+        left join packaging_type t on t.sid=i.typeSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

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<PagerVo<PackagingInventoryRecordVo>> listPage(@RequestBody PagerQuery<PackagingInventoryRecordQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PackagingInventoryRecordVo> pv = PackagingInventoryRecordService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新增")
+    @PostMapping("/save")
+    public ResultBean save (@RequestBody PackagingInventoryRecordDto dto){
+        return PackagingInventoryRecordService.save(dto);
+    }
+
+}

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<PackagingInventoryRecordMapper, PackagingInventoryRecord> {
+
+
+    public PagerVo<PackagingInventoryRecordVo> listPageVo(PagerQuery<PackagingInventoryRecordQuery> pq) {
+        PackagingInventoryRecordQuery query = pq.getParams();
+        QueryWrapper<PackagingInventoryRecord> 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<PackagingInventoryRecord> page = PagerUtil.queryToPage(pq);
+        IPage<PackagingInventoryRecordVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PackagingInventoryRecordVo> 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("新增成功");
+    }
+
+}

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<PackagingOutbound> {
+    IPage<PackagingOutboundVo> selectPageVo(IPage<PackagingOutbound> page, @Param(Constants.WRAPPER) Wrapper<PackagingOutbound> 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<PackagingOutboundVo> outboundList();
+    @Select("select * from tank_information where sid=#{sid}")
+    PackagingOutbound getOutboundBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingoutbound/PackagingOutboundMapper.xml

@@ -0,0 +1,18 @@
+<?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.packagingoutbound.PackagingOutboundMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingoutbound.PackagingOutboundVo">
+        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")
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

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<PagerVo<PackagingOutboundVo>> listPage(@RequestBody PagerQuery<PackagingOutboundQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PackagingOutboundVo> pv = PackagingOutboundService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/outboundList")
+    public ResultBean<PagerVo<PackagingOutboundVo>> outboundList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<PackagingOutboundVo> 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);
+    }
+
+}

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<PackagingOutboundMapper, PackagingOutbound> {
+
+    @Autowired
+    MaterialInventoryMapper rawMaterialInventoryMapper;
+    public PagerVo<PackagingOutboundVo> listPageVo(PagerQuery<PackagingOutboundQuery> pq) {
+        PackagingOutboundQuery query = pq.getParams();
+        QueryWrapper<PackagingOutbound> 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<PackagingOutbound> page = PagerUtil.queryToPage(pq);
+        IPage<PackagingOutboundVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PackagingOutboundVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PackagingOutboundVo> 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<MaterialInventory>().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);
+    }
+
+}

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<PackagingStorage> {
+    IPage<PackagingStorageVo> selectPageVo(IPage<PackagingStorage> page, @Param(Constants.WRAPPER) Wrapper<PackagingStorage> 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<PackagingStorageVo> StorageList();
+    @Select("select * from packaging_storage where sid=#{sid}")
+    PackagingStorage getStorageBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingstorage/PackagingStorageMapper.xml

@@ -0,0 +1,18 @@
+<?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.packagingstorage.PackagingStorageMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingstorage.PackagingStorageVo">
+        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
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

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<PagerVo<PackagingStorageVo>> listPage(@RequestBody PagerQuery<PackagingStorageQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PackagingStorageVo> pv = PackagingStorageService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/tankList")
+    public ResultBean<PagerVo<PackagingStorageVo>> listPage() {
+        ResultBean rb = ResultBean.fireFail();
+        List<PackagingStorageVo> 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);
+    }
+
+}

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<PackagingStorageMapper, PackagingStorage> {
+
+    @Autowired
+    MaterialInventoryMapper rawMaterialInventoryMapper;
+    public PagerVo<PackagingStorageVo> listPageVo(PagerQuery<PackagingStorageQuery> pq) {
+        PackagingStorageQuery query = pq.getParams();
+        QueryWrapper<PackagingStorage> 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<PackagingStorage> page = PagerUtil.queryToPage(pq);
+        IPage<PackagingStorageVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PackagingStorageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PackagingStorageVo> 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<MaterialInventory>().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);
+    }
+
+}

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<PackagingType> {
+    IPage<PackagingTypeVo> selectPageVo(IPage<PackagingType> page, @Param(Constants.WRAPPER) Wrapper<PackagingType> qw);
+    @Select("select * from packaging_type")
+    List<PackagingTypeVo> typeList();
+    @Select("select * from packaging_type where sid=#{sid}")
+    PackagingType getTypeBySid(@Param("sid")String sid);
+}

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packagingtype/PackagingTypeMapper.xml

@@ -0,0 +1,16 @@
+<?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.packagingtype.PackagingTypeMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.packagingtype.PackagingTypeVo">
+        SELECT
+        *
+        FROM
+        packaging_type
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

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<PagerVo<PackagingTypeVo>> listPage(@RequestBody PagerQuery<PackagingTypeQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<PackagingTypeVo> pv = PackagingTypeService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+    @ApiOperation("根据物料类型查询数据的列表")
+    @PostMapping("/typeList")
+    public ResultBean<PagerVo<PackagingTypeVo>> typeList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<PackagingTypeVo> 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);
+    }
+}

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<PackagingTypeMapper, PackagingType> {
+
+
+    public PagerVo<PackagingTypeVo> listPageVo(PagerQuery<PackagingTypeQuery> pq) {
+        PackagingTypeQuery query = pq.getParams();
+        QueryWrapper<PackagingType> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getName())){
+            qw.like("name",query.getName());
+        }
+
+        IPage<PackagingType> page = PagerUtil.queryToPage(pq);
+        IPage<PackagingTypeVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PackagingTypeVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public List<PackagingTypeVo> 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<PackagingType>().eq("sid",sid));
+        return rb.success().setMsg("删除成功");
+    }
+}