diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetails.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetails.java
index 04f06410..65fda28d 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetails.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetails.java
@@ -17,8 +17,8 @@ public class MaterialProcurementDetails extends BaseEntity {
     private String supplierSid;
     //合同签订日期
     private String contractSigningDate;
-    //原油类型
-    private String typeSid;
+    //物料库存
+    private String inventorySid;
     //单价
     private double price;
     //重量
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsDto.java
index 1fc83a4c..b1711d9d 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsDto.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsDto.java
@@ -23,7 +23,7 @@ public class MaterialProcurementDetailsDto implements Dto {
     //合同签订日期
     private String contractSigningDate;
     //原油类型
-    private String typeSid;
+    private String inventorySid;
     //单价
     private double price;
     //重量
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsQuery.java
index 3051c281..5965b130 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsQuery.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsQuery.java
@@ -18,8 +18,8 @@ public class MaterialProcurementDetailsQuery implements Query {
     private String supplierSid;
     //合同签订日期
     private String contractSigningDate;
-    //原油类型
-    private String typeSid;
+    //物料库存类型
+    private String inventorySid;
     //单价
     private double price;
     //重量
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsVo.java
index 80e9f5f3..50836faf 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialprocurementdetails/MaterialProcurementDetailsVo.java
@@ -23,7 +23,7 @@ public class MaterialProcurementDetailsVo implements Vo {
     //合同签订日期
     private String contractSigningDate;
     //原油类型
-    private String typeSid;
+    private String inventorySid;
     //单价
     private double price;
     //重量
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java
index a4b66535..814d5588 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorage.java
@@ -14,7 +14,6 @@ import lombok.Data;
 @TableName("material_storage")
 public class MaterialStorage extends BaseEntity {
     //合同号
-    private String contractNumber;
     //供应商sid
     private String supplierSid;
     //签订日期
@@ -29,6 +28,8 @@ public class MaterialStorage extends BaseEntity {
     private double value;
     //入库日期
     private String warehousingDate;
+    //订单sid
+    private String procSid;
 
 
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java
index 7a0ec74a..33a26218 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/materialstorage/MaterialStorageVo.java
@@ -36,5 +36,6 @@ public class MaterialStorageVo implements Vo {
     private double inventory=0;
     //物料名称
     private String name;
+    private double total;
 
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetails.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetails.java
new file mode 100644
index 00000000..ecdad724
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetails.java
@@ -0,0 +1,44 @@
+package com.yxt.supervise.cyf.api.packagingprocurementdetails;
+
+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/6/29 15:37
+ */
+@Data
+@ApiModel(value = "原料采购明细", description = "原料采购明细")
+@TableName("packaging_procurement_details")
+public class PackagingProcurementDetails extends BaseEntity {
+    //供应商
+    private String supplierSid;
+    //合同签订日期
+    private String contractSigningDate;
+    //物料库存
+    private String inventorySid;
+    //单价
+    private double price;
+    //重量
+    private double weight;
+    //付款日期
+    private String  paymentDate;
+    //付款金额
+    private double  payment;
+    //付款单位
+    private String  payer;
+    //付款单位开户行
+    private String  payerBank;
+    //收款单位
+    private String  payee;
+    //收款单位开户行
+    private String  payeeBank;
+    //摘要
+    private String  paymentSummary;
+    private String orderNumber;
+    //区分1原油 2包装物  3原料
+    private String type;
+    private String arrivalDate;
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsDto.java
new file mode 100644
index 00000000..959ea4bd
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsDto.java
@@ -0,0 +1,55 @@
+package com.yxt.supervise.cyf.api.packagingprocurementdetails;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.cyf.api.materialinventory.MaterialInventoryDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/29 15:37
+ */
+@Data
+public class PackagingProcurementDetailsDto implements Dto {
+    private String id;
+    private String sid;
+
+    //供应商
+    private String supplierSid;
+    //合同签订日期
+    private String contractSigningDate;
+    //原油类型
+    private String inventorySid;
+    //单价
+    private double price;
+    //重量
+    private double weight;
+    //付款日期
+    private String paymentDate;
+    //付款金额
+    private double payment;
+    //付款单位
+    private String payer;
+    //付款单位开户行
+    private String payerBank;
+    //收款单位
+    private String payee;
+    //收款单位开户行
+    private String payeeBank;
+    //摘要
+    private String paymentSummary;
+    //订单状态
+    private String state;
+    //订单编号
+    private String orderNumber;
+    //
+    private String type;
+    //到货日期
+    private String arrivalDate;
+    private List<MaterialInventoryDto> commodityList;
+    //操作 1:新增申请 2:发起申请 3:通过申请 4:不通过申请
+    private String operate;
+    //审批意见
+    private String approvalOpinions;
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsQuery.java
new file mode 100644
index 00000000..db5428d9
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsQuery.java
@@ -0,0 +1,43 @@
+package com.yxt.supervise.cyf.api.packagingprocurementdetails;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/29 15:37
+ */
+@Data
+public class PackagingProcurementDetailsQuery implements Query {
+    private String id;
+    private String sid;
+
+    //供应商
+    private String supplierSid;
+    //合同签订日期
+    private String contractSigningDate;
+    //物料库存类型
+    private String inventorySid;
+    //单价
+    private double price;
+    //重量
+    private double weight;
+    //付款日期
+    private String  paymentDate;
+    //付款金额
+    private double  payment;
+    //付款单位
+    private String  payer;
+    //付款单位开户行
+    private String  payerBank;
+    //收款单位
+    private String  payee;
+    //收款单位开户行
+    private String  payeeBank;
+    //摘要
+    private String  paymentSummary;
+    //订单状态
+    private String state;
+    //区分1原油 2包装物  3原料
+    private String type;
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsVo.java
new file mode 100644
index 00000000..63f8e269
--- /dev/null
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packagingprocurementdetails/PackagingProcurementDetailsVo.java
@@ -0,0 +1,9 @@
+package com.yxt.supervise.cyf.api.packagingprocurementdetails;
+
+/**
+ * @author wangpengfei
+ * @date 2023/6/29 15:37
+ */
+public class PackagingProcurementDetailsVo
+{
+}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.java
index a1fd8d04..9227b7c2 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.java
@@ -52,7 +52,7 @@ public interface MaterialProcurementDetailsMapper extends BaseMapper<MaterialPro
             "FROM\n" +
             "\tmaterial_procurement_details d\n" +
             "\tleft JOIN supplier_information s on d.supplierSid =s.sid\n" +
-            "\tleft join material_inventory c on c.sid =d.typeSid \n" +
+            "\tleft join material_inventory c on c.sid =d.inventorySid \n" +
             "\tleft join material_type m on m.sid =c.typeSid \n" +
             "WHERE\n" +
             "\td.sid=#{sid} \n" +
@@ -66,4 +66,6 @@ public interface MaterialProcurementDetailsMapper extends BaseMapper<MaterialPro
     List<ProcurementDetailsVo> getProByState(@Param("state")String state);
     @Select("select * from material_procurement_details where sid = #{sid}")
     List<MaterialProcurementDetails> selectList(@Param("sid") String sid);
+    @Select("select * from material_procurement_details where state =#{state} group by sid")
+    List<ProcurementDetailsVo> listByState(String state);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.xml
index 19bf6e42..72b83b7a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.xml
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsMapper.xml
@@ -6,7 +6,7 @@
         CASE d.state WHEN 1 THEN '待提交' WHEN 2 THEN '经理审批' WHEN 3 THEN '监管审批' WHEN 4 THEN '银行审批' WHEN 5 THEN '财务审批' WHEN 6 THEN '在途' WHEN 7 THEN '已入库' END AS stateValue, count(1) AS amount, sum(d.price * d.weight) AS totalValue
         FROM material_procurement_details d
         left JOIN supplier_information s on d.supplierSid =s.sid
-        left join material_inventory c on c.sid =d.typeSid
+        left join material_inventory c on c.sid =d.inventorySid
         left join material_type m on m.sid =c.typeSid
         <where>
             ${ew.sqlSegment}
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsRest.java
index cfd9ea3b..cbe72d63 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsRest.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsRest.java
@@ -7,11 +7,14 @@ import com.yxt.supervise.cyf.api.materialprocurementdetails.MaterialProcurementD
 import com.yxt.supervise.cyf.api.materialprocurementdetails.MaterialProcurementDetailsQuery;
 import com.yxt.supervise.cyf.api.materialprocurementdetails.MaterialProcurementDetailsVo;
 import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsDto;
+import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo;
 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 feikefei
  * @create 2023-06-02-9:23
@@ -30,7 +33,13 @@ public class MaterialProcurementDetailsRest {
         PagerVo<MaterialProcurementDetailsVo> pv = materialProcurementDetailsService.listPageVo(pq);
         return rb.success().setData(pv);
     }
-
+    @ApiOperation("数据的列表")
+    @PostMapping("/list")
+    public ResultBean<List<ProcurementDetailsVo>> list() {
+        ResultBean rb = ResultBean.fireFail();
+        List<ProcurementDetailsVo> pv = materialProcurementDetailsService.lists();
+        return rb.success().setData(pv);
+    }
     @ApiOperation("添加")
     @PostMapping("/save")
     public ResultBean save(@RequestBody MaterialProcurementDetailsDto dto){
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsService.java
index 559df27b..293a7c37 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialprocurementdetails/MaterialProcurementDetailsService.java
@@ -56,6 +56,11 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
         PagerVo<MaterialProcurementDetailsVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public List<ProcurementDetailsVo> lists() {
+        String state="6";
+        List<ProcurementDetailsVo> pagging = baseMapper.listByState(state);
+        return pagging;
+    }
 
     public ResultBean save(MaterialProcurementDetailsDto dto){
         ResultBean rb = ResultBean.fireFail();
@@ -78,7 +83,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
         }
         if (dto.getCommodityList().size() > 1){
             for(MaterialInventoryDto pro : dto.getCommodityList()){
-                entity.setTypeSid(pro.getSid());
+                entity.setInventorySid(pro.getSid());
                 entity.setState(1);
                 entity.setType("3");
                 entity.setWeight(pro.getWeight());
@@ -88,7 +93,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
             return rb.success().setMsg("新增成功");
         }else {
             for(MaterialInventoryDto pro : dto.getCommodityList()){
-                entity.setTypeSid(pro.getSid());
+                entity.setInventorySid(pro.getSid());
                 entity.setState(1);
                 entity.setType("3");
                 entity.setWeight(pro.getWeight());
@@ -118,7 +123,8 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
         ResultBean rb = new ResultBean();
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
-        List<MaterialProcurementDetails> materialProcurementDetails = baseMapper.selectList(new QueryWrapper<MaterialProcurementDetails>().eq("sid",dto.getSid()));
+        String sid =dto.getSid();
+        List<MaterialProcurementDetails> materialProcurementDetails = baseMapper.selectList(sid);
         SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString()));
         //不存在保存加提交
         if(dto.getSid().equals("")||dto.getSid().equals(null)){
@@ -138,7 +144,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
             if(dto.getCommodityList().size()>1){
                 for(MaterialInventoryDto pro:dto.getCommodityList()){
                     BeanUtil.copyProperties(dto, entity, "sid");
-                    entity.setTypeSid(pro.getTypeSid());
+                    entity.setInventorySid(pro.getSid());
                     entity.setState(2);
                     entity.setType("3");
                     entity.setWeight(pro.getWeight());
@@ -164,7 +170,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
             }
             for(MaterialInventoryDto pro : dto.getCommodityList()){
                 BeanUtil.copyProperties(dto, entity, "sid");
-                entity.setTypeSid(pro.getTypeSid());
+                entity.setInventorySid(pro.getSid());
                 entity.setState(2);
                 entity.setType("3");
                 entity.setWeight(pro.getWeight());
@@ -202,7 +208,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
         SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id",StpUtil.getLoginIdAsString()));
         String dtoSid = dto.getSid();
         ApprovalRecordDto recordDto=new ApprovalRecordDto();
-        List<MaterialProcurementDetails> list=baseMapper.selectList(new QueryWrapper<MaterialProcurementDetails>().eq("sid",dtoSid));
+        List<MaterialProcurementDetails> list=baseMapper.selectList(dtoSid);
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
         if(dto.getOperate().equals("3")){
@@ -246,7 +252,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
         MaterialProcurementDetailsVo materialProcurementDetailsVo = baseMapper.getProBySid(sid);
         List<MaterialInventoryVo> list =new ArrayList<>();
         for (MaterialProcurementDetailsVo pro : RawProcurementDetails){
-            MaterialInventoryVo materialInventoryVo = baseMapper.getMaterial1BySid(pro.getTypeSid());
+            MaterialInventoryVo materialInventoryVo = baseMapper.getMaterial1BySid(pro.getInventorySid());
             materialInventoryVo.setWeight(pro.getWeight());
             materialInventoryVo.setPrice(pro.getPrice());
             list.add(materialInventoryVo);
@@ -258,7 +264,7 @@ public class MaterialProcurementDetailsService extends MybatisBaseService<Materi
         ResultBean rb=new ResultBean();
         List<ProcurementDetailsVo>list=baseMapper.getProByState(state);
         for(ProcurementDetailsVo procurementDetailsVo:list){
-            List<MaterialProcurementDetails> details=baseMapper.selectList(new QueryWrapper<MaterialProcurementDetails>().eq("sid",procurementDetailsVo.getSid()));
+            List<MaterialProcurementDetails> details=baseMapper.selectList(procurementDetailsVo.getSid());
             //订单总价值
             double i=0;
             //入库总价值
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.java
index 8bbe2f24..28a7a322 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageMapper.java
@@ -4,6 +4,7 @@ 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.crudeoilstorage.CrudeOilStorageVo;
 import com.yxt.supervise.cyf.api.materialstorage.MaterialStorage;
 import com.yxt.supervise.cyf.api.materialstorage.MaterialStorageVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,4 +28,13 @@ public interface MaterialStorageMapper extends BaseMapper<MaterialStorage> {
     List<MaterialStorageVo> StorageList();
     @Select("select * from material_storage where sid=#{sid}")
     MaterialStorage getStorageBySid(@Param("sid")String sid);
+    @Select("SELECT\n" +
+            "\ts.* ,sum( s.weight ) AS total,t.sid as typeSid\n" +
+            "FROM\n" +
+            "\tmaterial_storage s\n" +
+            "\tLEFT JOIN material_inventory i ON s.inventorySid = i.sid\n" +
+            "\tLEFT JOIN material_type t ON i.typeSid = t.sid \n" +
+            "WHERE\n" +
+            "\ts.procSid = #{procSid} and s.inventorySid =#{inventorySid}")
+    MaterialStorageVo getMaterialByProcSid(@Param("procSid")String procSid, @Param("inventorySid")String inventorySid);
 }
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java
index 6cdc0dd8..304e512a 100644
--- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java
+++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/materialstorage/MaterialStorageService.java
@@ -69,49 +69,50 @@ public class MaterialStorageService extends MybatisBaseService<MaterialStorageMa
         ResultBean rb=new ResultBean();
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
-//        if(null!=dto.getProcSid()&& ""!=dto.getProcSid()){
-//            SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", StpUtil.getLoginIdAsString()));
-//            //要入的的原油类型
-//            //CrudeOilStorageVo v=baseMapper.getTypeByTankSid(dto.getTankSid());
-//            //入库记录
-//            CrudeOilStorageVo vo=baseMapper.getCrudeByProcSid(dto.getProcSid(),v.getTypeSid());
-//            //订单记录
-//            MaterialProcurementDetails procurementDetails=materialProcurementDetailsMapper.selectOne(new QueryWrapper<MaterialProcurementDetails>().eq("sid",dto.getProcSid()).eq("typeSid",v.getTypeSid()));
-//            if(null==procurementDetails){
-//                return rb.setMsg("订单中没有，所选的原油类型");
-//            }
-//            double q=0;
-//            if(null!=vo){
-//                q=vo.getTotal();
-//            }
-//            if( (q+dto.getWeight())>procurementDetails.getWeight()){
-//                return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
-//            }else if((q+dto.getWeight())==procurementDetails.getWeight()){
-//                procurementDetails.setState(7);
-//                materialProcurementDetailsMapper.update(procurementDetails,new QueryWrapper<MaterialProcurementDetails>().eq("sid",procurementDetails.getSid()).eq("typeSid",v.getTypeSid()));
-//            }
-//            //订单上所有的商品
-//            List<MaterialProcurementDetails> selectList=materialProcurementDetailsMapper.selectList(new QueryWrapper<MaterialProcurementDetails>().eq("sid",dto.getProcSid()));
-//            int i=0;
-//            for(MaterialProcurementDetails p:selectList){
-//                if(p.getState()==7){
-//                    i++;
-//                }
-//                if(i==selectList.size()){
-//                    //审批记录
-//                    ApprovalRecordDto recordDto=new ApprovalRecordDto();
-//                    recordDto.setProSid(dto.getProcSid());
-//                    recordDto.setApprover(sysUser.getSid());
-//                    recordDto.setApprovalOpinions("完成订单");
-//                    recordDto.setOperate("5");
-//                    recordDto.setApprovalDate(dfmt);
-//                    approvalRecordService.save(recordDto);
-//                }
-//            }
-//        }
+        if(null!=dto.getProcSid()&& ""!=dto.getProcSid()){
+            SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", StpUtil.getLoginIdAsString()));
+            //要入的的物料类型
+            //CrudeOilStorageVo v=baseMapper.getTypeByTankSid(dto.getInventorySid());
+            //入库记录
+            MaterialStorageVo vo=baseMapper.getMaterialByProcSid(dto.getProcSid(),dto.getInventorySid());
+            //订单记录
+            MaterialProcurementDetails procurementDetails=materialProcurementDetailsMapper.selectOne(new QueryWrapper<MaterialProcurementDetails>().eq("sid",dto.getProcSid()).eq("inventorySid",dto.getInventorySid()));
+            if(null==procurementDetails){
+                return rb.setMsg("订单中没有，所选的物料类型");
+            }
+            double q=0;
+            if(null!=vo){
+                q=vo.getTotal();
+            }
+            if( (q+dto.getWeight())>procurementDetails.getWeight()){
+                return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
+            }else if((q+dto.getWeight())==procurementDetails.getWeight()){
+                procurementDetails.setState(7);
+                materialProcurementDetailsMapper.update(procurementDetails,new QueryWrapper<MaterialProcurementDetails>().eq("sid",procurementDetails.getSid()).eq("inventorySid",dto.getInventorySid()));
+            }
+            //订单上所有的商品
+            List<MaterialProcurementDetails> selectList=materialProcurementDetailsMapper.selectList(dto.getProcSid());
+            int i=0;
+            for(MaterialProcurementDetails p:selectList){
+                if(p.getState()==7){
+                    i++;
+                }
+                if(i==selectList.size()){
+                    //审批记录
+                    ApprovalRecordDto recordDto=new ApprovalRecordDto();
+                    recordDto.setProSid(dto.getProcSid());
+                    recordDto.setApprover(sysUser.getSid());
+                    recordDto.setApprovalOpinions("完成订单");
+                    recordDto.setOperate("5");
+                    recordDto.setApprovalDate(dfmt);
+                    approvalRecordService.save(recordDto);
+                }
+            }
+        }
         MaterialStorage entity=new MaterialStorage();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setWarehousingDate(dfmt);
+        entity.setProcSid(dto.getProcSid());
         baseMapper.insert(entity);
         MaterialInventory rawMaterialInventory=rawMaterialInventoryMapper.selectOne(new QueryWrapper<MaterialInventory>().eq("sid",dto.getInventorySid()));
         rawMaterialInventory.setInventory(rawMaterialInventory.getInventory()+dto.getWeight());
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
index 19c81772..6c59db41 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java
@@ -1,5 +1,7 @@
 package com.yxt.supervise.report.biz.reportinventory;
 
+import cn.hutool.core.thread.ThreadUtil;
+import com.yxt.supervise.report.biz.wechat.WechatRest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,12 +17,25 @@ public class ReportInventoryService {
     private ReportInventoryDayStoreService reportInventoryDayStoreService;
     @Autowired
     private ReportInventoryDayTobaccoStoreService reportInventoryDayTobaccoStoreService;
+    @Autowired
+    private WechatRest wechatRest;
 
 
     public void buildInventoryReportByDay(String orderDate) {
         reportInventoryDayGatherService.clearAndBuildOfDay(orderDate);
         reportInventoryDayStoreService.clearAndBuildOfDay(orderDate);
         reportInventoryDayTobaccoStoreService.clearAndBuildOfDay(orderDate);
+        //生成完发推送消息
+        ThreadUtil.execute(() -> {
+            try {
+                sendMessage(orderDate);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+    public void sendMessage(String orderDate) throws Exception {
+        //wechatRest.inventorySendMessage(orderDate);
     }
     public String buildsExcelById(String orderDate) {
 //        long millis = System.currentTimeMillis();
diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
index dbfb3e49..391b9c51 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
@@ -121,8 +121,8 @@ public class WechatRest {
     }
     //仓库库存日报推送
     @PostMapping("/inventorySendMessage")
-    public void inventorySendMessage(@RequestBody WeChatTemplateMsg data) throws Exception {
-        ReportInventoryDayGatherVo csmCashReportVo=reportInventoryDayGatherMapper.getReportInventoryDayGather("2023-06-25");
+    public void inventorySendMessage(String orderDate) throws Exception {
+        ReportInventoryDayGatherVo csmCashReportVo=reportInventoryDayGatherMapper.getReportInventoryDayGather(orderDate);
         // openId代表一个唯一微信用户，即微信消息的接收人
 //        String openId="otnrM57kui-WCUmRtChhb1HguOgw";
         //郭