Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/StockPurchaseReceiptReportController.java

@@ -33,8 +33,6 @@ public class StockPurchaseReceiptReportController {
     public Page<StockPurchaseReceiptReport> selectPurchaseOrder(StockPurchaseReceiptReport stockPurchaseReceiptReport){
         return stockPurchaseReceiptReportService.selectPurchaseOrder(stockPurchaseReceiptReport);
     }
-
-
     /**
      * 定金/备注
      *
@@ -42,7 +40,7 @@ public class StockPurchaseReceiptReportController {
      * @return
      */
     @PostMapping("/api/disAndRemark")
-    public  String disAndRemark(ContractManagementInfo contractManagementInfo){
+    public  String disAndRemark(@RequestBody ContractManagementInfo contractManagementInfo){
         return stockPurchaseReceiptReportService.disAndRemark(contractManagementInfo);
     }
 
@@ -55,7 +53,7 @@ public class StockPurchaseReceiptReportController {
      * @return
      */
     @PostMapping("/api/edit")
-    public  String edit(StockPurchaseReceiptReport stockPurchaseReceiptReport){
+    public  String edit(@RequestBody StockPurchaseReceiptReport stockPurchaseReceiptReport){
         return stockPurchaseReceiptReportService.edit(stockPurchaseReceiptReport);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import java.util.Date;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -325,6 +326,9 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
 
     @TableField(exist = false)
     private ContractProcessInfo contractProcessInfo;
+
+    @TableField(exist = false)
+    private List<ContractManagementInfo> contractManagementInfoList;
     /**
      * 报表状态
      */
@@ -335,6 +339,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private String listStatus;
+    /**
+     * 修改标识(0备注1定金)
+     */
+    @TableField(exist = false)
+    private String flag;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/StockPurchaseReceiptReport.java

@@ -11,10 +11,12 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -52,6 +54,8 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
     /**
      * 入库日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date warehousingDate;
     /**
      * 净重（吨）
@@ -92,6 +96,8 @@ public class StockPurchaseReceiptReport extends BaseModel<StockPurchaseReceiptRe
     /**
      * 付款日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date paymentDate;
     /**
      * 已开发票(元)

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IStockPurchaseReceiptReportService.java

@@ -32,8 +32,6 @@ public interface IStockPurchaseReceiptReportService extends IService<StockPurcha
      * @return
      */
     String disAndRemark(ContractManagementInfo contractManagementInfo);
-
-
     /**
      * 修改结算重量
      *
@@ -41,7 +39,6 @@ public interface IStockPurchaseReceiptReportService extends IService<StockPurcha
      * @return
      */
     String edit(StockPurchaseReceiptReport stockPurchaseReceiptReport);
-
     /**
      * 出纳付款
      * @param stockPurchaseReceiptReport

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockPurchaseReceiptReportServiceImpl.java

@@ -207,7 +207,6 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 .eq("comp_id", compId)
                 .eq("contract_type", "2")
                 .eq("delete_flag", "0")
-                .eq("goods_type","1")
                 .orderBy("update_date", false));
         for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
             Float money = 0.0f;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -785,7 +785,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 list.add(commonRoleService.selectById(commonStaffRole.getRoleId()));
             }
             for(CommonRole commonRole : list){
-                if(commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("系统管理员")|| commonRole.getRoleName().contains("总")){
+                if(commonRole.getRoleName().equals("决策人") || commonRole.getRoleName().equals("财务")|| commonRole.getRoleName().equals("出纳")|| commonRole.getRoleName().equals("系统管理员")|| commonRole.getRoleName().contains("总")){
                     List<WarehouseBaseInfo> warehouseBaseInfoList1 = this.selectList(new EntityWrapper<WarehouseBaseInfo>()
                             .eq("comp_id", compId)
                             .eq("warehouse_type","1")

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -55,6 +55,9 @@
         m.unit_contract_price as unitContractPrice,
         m.packing_method as packingMethod,
         m.buyer,
+        m.deposit,
+        m.remarks,
+        m.deposit_url as depositUrl,
         m.seller,
         p.imperfect_grain as imperfectGrain,
         m.status,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/StockPurchaseReceiptReportMapper.xml

@@ -1,9 +1,6 @@
 <?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.yh.saas.plugin.yiliangyiyun.mapper.StockPurchaseReceiptReportMapper">
-
-
-
     <!-- 获得采购入库统计总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
@@ -20,7 +17,7 @@
                 AND amount_ing_payable-amount_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
+        <if test="contractNo != null and contractNo != ''">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">