diff --git a/yxt-supervise-cyf/docs/databases/create_table.sql b/yxt-supervise-cyf/docs/databases/create_table.sql
index f88b832b..00096a0f 100644
--- a/yxt-supervise-cyf/docs/databases/create_table.sql
+++ b/yxt-supervise-cyf/docs/databases/create_table.sql
@@ -712,3 +712,23 @@ CREATE TABLE `material_procurement_details`  (
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+DROP TABLE IF EXISTS `approval_record`;
+CREATE TABLE `approval_record`  (
+`sid` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'sid',
+`lockVersion` int(0) NULL DEFAULT 0 COMMENT '版本锁',
+`createTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+`modifyTime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+`isEnable` int(0) NULL DEFAULT 1 COMMENT '是否可用：1可用，0不可用',
+`state` int(0) NULL DEFAULT 1 COMMENT '状态',
+`isDelete` int(0) NULL DEFAULT 0 COMMENT '是否删除：0未删除，1已删除',
+`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',
+`proSid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '订单sid',
+`approver` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审批人',
+`approvalDate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审批日期',
+`approvalOpinions` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '审批意见',
+`operate` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1:新增申请 2:发起申请 3:通过申请 4:不通过申请 5:订单完成'
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '审批记录' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java
index da34421c..6375ed1a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/approvalrecord/ApprovalRecord.java
@@ -26,4 +26,5 @@ public class ApprovalRecord extends BaseEntity {
     private String operate;
     //审批人名
     private String approverName;
+    private String operateValue;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java
index e6dcf379..9eec6fda 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorage.java
@@ -13,8 +13,9 @@ import lombok.Data;
 @ApiModel(value = "原油入库信息", description = "原油入库信息")
 @TableName("crude_oil_storage")
 public class CrudeOilStorage extends BaseEntity {
-
-    //销售合同编号
+    //采购订单sid
+    private String procSid;
+    //合同编号
     private String contractNumber;
     //签订时间
     private String contractSigningDate;
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java
index e87733fd..dde8cef7 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageDto.java
@@ -16,8 +16,6 @@ public class CrudeOilStorageDto implements Dto {
     private String sid;
 
 
-    //销售合同编号
-    private String contractNumber;
     //签订时间
     private String contractSigningDate;
     //油罐sid
@@ -35,4 +33,6 @@ public class CrudeOilStorageDto implements Dto {
     private String warehousingDate;
     @ApiModelProperty("原油入库附件")
     private String[] crudeOilStorageFile;
+    //采购订单sid
+    private String procSid;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java
index ac132e8f..bc1ee6ba 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilstorage/CrudeOilStorageVo.java
@@ -14,8 +14,9 @@ public class CrudeOilStorageVo implements Vo {
     private String id;
     private String sid;
 
-
-    //销售合同编号
+    //采购订单sid
+    private String procSid;
+    //合同编号
     private String contractNumber;
     //签订时间
     private String contractSigningDate;
@@ -38,5 +39,6 @@ public class CrudeOilStorageVo implements Vo {
     private String warehousingDate;
     private String supplierName;
     private double inventory=0;
+    private double total;
 
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java
index e182e7ca..ebceffbf 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformation.java
@@ -21,5 +21,9 @@ public class CrudeOilTypeInformation extends BaseEntity {
     //原油code
     private String code;
     private double price;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java
index cd3ae871..74ed5d18 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationDto.java
@@ -21,4 +21,8 @@ public class CrudeOilTypeInformationDto implements Dto {
     private String code;
     private double price;
     private double weight;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java
index b84b239f..7b981e3c 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiltypeinformation/CrudeOilTypeInformationVo.java
@@ -26,4 +26,8 @@ public class CrudeOilTypeInformationVo implements Vo {
     private double price;
     private String logo = "1";
     private double weight;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java
index d783df0e..d1df7cc9 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventory.java
@@ -23,4 +23,8 @@ public class MaterialInventory extends BaseEntity {
     private double initialInventory=0;
     //物料类型
     private String typeSid;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java
index 779ee65a..326590fc 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryDto.java
@@ -25,4 +25,8 @@ public class MaterialInventoryDto implements Dto {
     private String typeSid;
     private Double price;
     private Double weight;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java
index 4b1ffe05..a416b9c4 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialinventory/MaterialInventoryVo.java
@@ -28,4 +28,8 @@ public class MaterialInventoryVo implements Vo {
     private String typeName;
     private Double weight;
     private Double price;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java
index d54880c4..b5563537 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventory.java
@@ -23,4 +23,8 @@ public class PackagingInventory extends BaseEntity {
     private double initialInventory=0;
     //包装物类型
     private String typeSid;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java
index bc5fc860..69e6f576 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryDto.java
@@ -25,5 +25,9 @@ public class PackagingInventoryDto implements Dto {
     private String typeSid;
     //备注
     private String remarks;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java
index b2317b9c..5e4d8d9a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventory/PackagingInventoryVo.java
@@ -24,4 +24,8 @@ public class PackagingInventoryVo implements Vo {
     private double initialInventory=0;
     //包装物类型
     private String typeSid;
+    //单位
+    private String unit;
+    //商品规格
+    private String proSpec;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetails.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetails.java
index 30c989c9..21e04719 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetails.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetails.java
@@ -41,5 +41,8 @@ public class ProcurementDetails extends BaseEntity {
     private String orderNumber;
     //区分1原油 2包装物  3原料
     private String type;
+
     private String arrivalDate;
+
+    private Integer state;
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsDto.java
index b9dd8678..c93940cf 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/procurementdetails/ProcurementDetailsDto.java
@@ -50,7 +50,7 @@ public class ProcurementDetailsDto implements Dto {
     //到货日期
     private String arrivalDate;
     private List<CrudeOilTypeInformationDto> commodityList;
-    //操作 1:新增申请 2:发起申请 3:通过申请 2:不通过申请
+    //操作 1:新增申请 2:发起申请 3:通过申请 4:不通过申请
     private String operate;
     //审批意见
     private String approvalOpinions;
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml
index d28f015d..732ae137 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/approvalrecord/ApprovalRecordMapper.xml
@@ -15,7 +15,14 @@
 
 
     <select id="selectRecordBySid" resultType="com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecord">
-        select a.*,s.userName as approverName
+        select a.*,s.userName as approverName,
+        case a.operate
+            when 1 then '订单创建'
+            when 2 then '订单发起'
+            when 3 then '订单通过'
+            when 4 then '订单不通过'
+            when 5 then '订单已完成'
+        end as operateValue
         from approval_record a
         left join sys_user s on s.sid=a.approver
         where proSid = #{sid}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java
index e9e13f31..fedb6558 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorage;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo;
+import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -28,4 +29,7 @@ public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
 
     @Select("select s.*,f.url from crude_oil_storage s inner join crude_oil_storage_file f on s.sid = f.mainSid where s.sid = #{sid}")
     List<CrudeOilStorage> selectStorageBySid(@Param("sid") String sid);
+
+    @Select("select *,sum(weight) as total from crude_oil_storage where procSid=#{procSid}")
+    CrudeOilStorageVo getCreateByProcSid(@Param("procSid")String procSid);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml
index ba3087ce..2802ab8b 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.xml
@@ -6,12 +6,13 @@
     <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo">
         SELECT
         *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,
-        s.supplierName as supplierName
+        s.supplierName as supplierName,d.orderNumber as contractNumber
         FROM
         crude_oil_storage c
         left join tank_information t on t.sid=c.tankSid
         left join  crude_oil_type_information i on i.sid =t.crudeSid
         left join supplier_information s on s.sid =c.supplierSid
+        left join procurement_details d on d.sid =c.procSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
index b1d8f573..128f997a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java
@@ -1,6 +1,7 @@
 package com.yxt.supervise.cyf.biz.crudeoilstorage;
 
 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;
@@ -8,11 +9,17 @@ 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.approvalrecord.ApprovalRecord;
+import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorage;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageDto;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageQuery;
 import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorageVo;
+import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetails;
+import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo;
 import com.yxt.supervise.cyf.api.tankinformation.TankInformation;
+import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordService;
+import com.yxt.supervise.cyf.biz.procurementdetails.ProcurementDetailsMapper;
 import com.yxt.supervise.cyf.biz.tankinformation.TankInformationMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +36,11 @@ import java.util.*;
 public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMapper, CrudeOilStorage> {
     @Autowired
     TankInformationMapper tankInformationMapper;
+    @Autowired
+    ProcurementDetailsMapper procurementDetailsMapper;
 
+    @Autowired
+    ApprovalRecordService approvalRecordService;
     public PagerVo<CrudeOilStorageVo> listPageVo(PagerQuery<CrudeOilStorageQuery> pq) {
         CrudeOilStorageQuery query = pq.getParams();
         QueryWrapper<CrudeOilStorage> qw = new QueryWrapper<>();
@@ -46,8 +57,14 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
     }
     @Transactional
     public ResultBean save(CrudeOilStorageDto dto){
-
         ResultBean rb=new ResultBean();
+        ProcurementDetailsVo procurementDetailsVo= procurementDetailsMapper.getProBySid(dto.getProcSid());
+        CrudeOilStorageVo vo=baseMapper.getCreateByProcSid(dto.getProcSid());
+        Date curDate = new Date();
+        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        if(dto.getWeight()* procurementDetailsVo.getPrice() >procurementDetailsVo.getTotalValue()){
+            return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+        }
         CrudeOilStorage entity=new CrudeOilStorage();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         String [] file=dto.getCrudeOilStorageFile();
@@ -67,15 +84,25 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
         baseMapper.insert(entity);
         //油罐库存增加
         TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
-        //第一次入库/出库的时候用初始库存减去要出入的数量 给总库存
-//        if(tank.getLockVersion().equals(0)){
-//            tank.setInventory(tank.getInitialInventory()+dto.getWeight());
-//            tank.setLockVersion(tank.getLockVersion()+1);
-//        }else{
-//            tank.setInventory(tank.getInventory()+dto.getWeight());
-//        }
         tank.setInventory(tank.getInventory()+dto.getWeight());
         tankInformationMapper.updateById(tank);
+        //判断此订单入库价值是否足够
+        if(vo.getTotal()*procurementDetailsVo.getPrice()==procurementDetailsVo.getTotalValue()){
+            //入库价值和采购价值相比  相同修改订单状态
+            List<ProcurementDetails> list=procurementDetailsMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",dto.getProcSid()));
+            for(ProcurementDetails pro:list){
+                pro.setState(7);
+                procurementDetailsMapper.updateById(pro);
+            }
+            //审批记录
+            ApprovalRecordDto recordDto=new ApprovalRecordDto();
+            recordDto.setProSid(dto.getProcSid());
+            recordDto.setApprover("");
+            recordDto.setApprovalOpinions("完成订单");
+            recordDto.setOperate("5");
+            recordDto.setApprovalDate(dfmt);
+            approvalRecordService.save(recordDto);
+        }
         return rb.success().setMsg("新增成功");
     }
     public ResultBean update (CrudeOilStorageDto dto){
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsRest.java
index ca589dc4..9ebea735 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsRest.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsRest.java
@@ -32,6 +32,13 @@ public class ProcurementDetailsRest {
         PagerVo<ProcurementDetailsVo> pv = RawProcurementDetailsService.listPageVo(pq);
         return rb.success().setData(pv);
     }
+    @ApiOperation("数据的列表")
+    @PostMapping("/list")
+    public ResultBean<List<ProcurementDetailsVo>> list() {
+        ResultBean rb = ResultBean.fireFail();
+        List<ProcurementDetailsVo> pv = RawProcurementDetailsService.lists();
+        return rb.success().setData(pv);
+    }
     @ApiOperation("根据订单状态查询数据的列表")
     @PostMapping("/listByState")
     public ResultBean<PagerVo<ProcurementDetailsVo>> listBystate(String state) {
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java
index d9573b8e..a3d74165 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java
@@ -69,6 +69,12 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         PagerVo<ProcurementDetailsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public List<ProcurementDetailsVo> lists() {
+        String state="6";
+        List<ProcurementDetailsVo> pagging = baseMapper.listByState(state);
+        return pagging;
+    }
+
     public List<ProcurementDetailsVo> listByState(String state) {
         List<ProcurementDetailsVo> pagging = baseMapper.listByState(state);
         return pagging;
@@ -86,7 +92,7 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
             ApprovalRecordDto recordDto=new ApprovalRecordDto();
             recordDto.setProSid(entity.getSid());
             recordDto.setApprover(sysUser.getSid());
-            recordDto.setApprovalOpinions(dto.getApprovalOpinions());
+            recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单创建":dto.getApprovalOpinions());
             recordDto.setOperate("1");
             recordDto.setApprovalDate(dfmt);
             approvalRecordService.save(recordDto);
@@ -125,31 +131,33 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         //不存在保存加提交
         if(sid.equals("")||sid.equals(null)){
             ProcurementDetails entity=new ProcurementDetails();
+            BeanUtil.copyProperties(dto, entity, "sid");
+            //提交记录
+            ApprovalRecordDto recordDto=new ApprovalRecordDto();
+            recordDto.setProSid(entity.getSid());
+            recordDto.setApprover(sysUser.getSid());
+            recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单创建":dto.getOperate());
+            recordDto.setOperate("1");
+            recordDto.setApprovalDate(dfmt);
+            approvalRecordService.save(recordDto);
+            //发起采购申请记录
+            recordDto.setOperate("2");
+            recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单发起":dto.getOperate());
+            approvalRecordService.save(recordDto);
             if(dto.getCommodityList().size()>1){
-                BeanUtil.copyProperties(dto, entity, "sid");
                 for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
                     entity.setTypeSid(pro.getSid());
-                    entity.setState(procurementDetails.get(1).getState()+1);
+                    entity.setState(2);
                     entity.setType("1");
                     entity.setWeight(pro.getWeight());
                     entity.setPrice(pro.getPrice());
                     baseMapper.insert(entity);
                 }
-                //提交记录
-                ApprovalRecordDto recordDto=new ApprovalRecordDto();
-                recordDto.setProSid(entity.getSid());
-                recordDto.setApprover(sysUser.getSid());
-                recordDto.setApprovalOpinions(dto.getApprovalOpinions());
-                recordDto.setOperate("1");
-                recordDto.setApprovalDate(dfmt);
-                approvalRecordService.save(recordDto);
-                recordDto.setOperate("2");
-                approvalRecordService.save(recordDto);
                 return rb.success().setMsg("新增成功");
             }
             for(CrudeOilTypeInformationDto pro:dto.getCommodityList()){
                 entity.setTypeSid(pro.getSid());
-                entity.setState(procurementDetails.get(1).getState()+1);
+                entity.setState(2);
                 entity.setType("1");
                 entity.setWeight(pro.getWeight());
                 entity.setPrice(pro.getPrice());
@@ -159,13 +167,13 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
             //存在该状态
             List<ProcurementDetails> list =baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
             for(ProcurementDetails pro:list){
-                pro.setState(procurementDetails.get(1).getState()+1);
+                pro.setState(procurementDetails.get(0).getState()+1);
                 baseMapper.updateById(pro);
             }
             ApprovalRecordDto recordDto=new ApprovalRecordDto();
-            recordDto.setProSid(list.get(1).getSid());
+            recordDto.setProSid(list.get(0).getSid());
             recordDto.setApprover(sysUser.getSid());
-            recordDto.setApprovalOpinions(dto.getApprovalOpinions());
+            recordDto.setApprovalOpinions(dto.getApprovalOpinions()==null?"订单发起":dto.getApprovalOpinions());
             recordDto.setOperate(dto.getOperate()==null?"2":dto.getOperate());
             recordDto.setApprovalDate(dfmt);
             approvalRecordService.save(recordDto);
@@ -187,21 +195,35 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         String dtoSid = dto.getSid();
         ApprovalRecordDto recordDto=new ApprovalRecordDto();
         List<ProcurementDetails> list=baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",dtoSid));
-        if(dto.getOperate().equals("1")){
+        Date curDate = new Date();
+        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        if(dto.getOperate().equals("3")){
+            //审核通过
             for(ProcurementDetails procurementDetails:list){
-                BeanUtil.copyProperties(dto, procurementDetails, "id","sid");
+                procurementDetails.setPaymentDate(dfmt);
+                procurementDetails.setPayment(dto.getPayment()==0?0:dto.getPayment());
+                procurementDetails.setPayer(dto.getPayer()==null?"":dto.getPayer());
+                procurementDetails.setPayerBank(dto.getPayerBank()==null?"":dto.getPayerBank());
+                procurementDetails.setPayee(dto.getPayee()==null?"":dto.getPayee());
+                procurementDetails.setPayeeBank(dto.getPayeeBank()==null?"":dto.getPayeeBank());
+                procurementDetails.setPaymentSummary(dto.getPaymentSummary()==null?"":dto.getPaymentSummary());
+                procurementDetails.setState(procurementDetails.getState()+1);
                 baseMapper.updateById(procurementDetails);
             }
             recordDto.setOperate(dto.getOperate());
-        }else{
+        }else if(dto.getOperate().equals("4")){
+            //审核不通过
+            for(ProcurementDetails procurementDetails:list){
+                procurementDetails.setState(8);
+                baseMapper.updateById(procurementDetails);
+            }
             recordDto.setOperate(dto.getOperate());
         }
-        Date curDate = new Date();
-        String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         recordDto.setProSid(dtoSid);
         recordDto.setApprover(sysUser.getSid());
         recordDto.setApprovalOpinions(dto.getApprovalOpinions());
         recordDto.setApprovalDate(dfmt);
+        approvalRecordService.save(recordDto);
         return rb.success().setMsg("修改成功");
     }
     public ResultBean getProcurementBySid(String sid){