Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/CustmonthMapper.java

@@ -8,5 +8,6 @@ import java.util.Map;
 
 public interface CustmonthMapper {
     List<Custmonth> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<Custmonth> selectCalculateFields(@Param("con") String con, @Param("companyId") Long companyId);
     void callCustm(Map<String, Integer> map);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/VendmonthMapper.java

@@ -8,5 +8,6 @@ import java.util.Map;
 
 public interface VendmonthMapper {
     List<Vendmonth> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
+    List<Vendmonth> selectCalculateFields(@Param("con") String con, @Param("companyId") Long companyId);
     void callVend(Map<String, Integer> map);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/MoneyReportServiceImpl.java

@@ -55,7 +55,6 @@ public class MoneyReportServiceImpl implements MoneyReportService {
     public Map<String, Object> payDetail(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "payDetail");
     }
-
     @Override
     public Map<String, Object> recDetail(PageRequest page, ListReqDTO req) {
         return getListDATA(page, req, "recDetail");
@@ -312,7 +311,11 @@ public class MoneyReportServiceImpl implements MoneyReportService {
         if ("Supplier".equals(type) || "customercheck".equals(type)){
             arrs = JSONArray.toJSON(list1);
             map.put("calculate", arrs);
-        }else {
+        }else if("vendormonthdetails".equals(type)){
+            map.put("calculate", vendmonthMapper.selectCalculateFields(con, companyId));
+        }else if("custormonthdetails".equals(type)){
+            map.put("calculate", custmonthMapper.selectCalculateFields(con, companyId));
+        }else{
             map.put("calculate", arr);
         }
         return map;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -604,7 +604,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
                 for(VerificationdetDTO det : items1){
                     Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
                     Subledger sub = subledgerMapper.selectByPrimaryKey(Math.toIntExact(det.getVd_slid()));
-                    if (sub != null && sub.getSl_preamount() != 0 &&
+                    if (sub != null && sub.getSl_preamount() !=null && sub.getSl_preamount() != 0 &&
                             ("receivable_to_receivable".equals(verificationDTO.getVc_kind()) || "payable_to_payable".equals(verificationDTO.getVc_kind()))) {
                         nowbalanceDet=-1*nowbalanceDet;
                     }
@@ -898,7 +898,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         for(Verificationdet det : items1){
             Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
             Subledger sub = subledgerMapper.selectByPrimaryKey(Math.toIntExact(det.getVd_slid()));
-            if (sub != null && sub.getSl_preamount() != 0 &&
+            if (sub != null && sub.getSl_preamount() != null && sub.getSl_preamount() != 0 &&
                     ("receivable_to_receivable".equals(verificationDTO.getVc_kind()) || "payable_to_payable".equals(verificationDTO.getVc_kind())
                     || "应收转应收".equals(verificationDTO.getVc_kind()) || "应付转应付".equals(verificationDTO.getVc_kind()))) {
                 nowbalanceDet=-1*nowbalanceDet;

applications/money/money-server/src/main/resources/mapper/CustmonthMapper.xml

@@ -19,12 +19,30 @@
     <result column="cm_nowprepayamount" property="cm_nowprepayamount" jdbcType="DOUBLE" />
     <result column="cm_endpreamount" property="cm_endpreamount" jdbcType="DOUBLE" />
     <result column="cm_currency" property="cm_currency" jdbcType="VARCHAR" />
+    <result column="cm_rate" property="cm_rate" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     cm_id, cm_yearmonth, cm_custid, cm_custcode, cm_custname, CM_BEGINAMOUNT, CM_NOWAMOUNT, 
     CM_NOWPREAMOUNT, CM_ENDAMOUNT, companyid,cm_endpreamount,cm_nowprepayamount,cm_nowpayamount,cm_beginpreamount,cm_currency
   </sql>
 
+  <select id="selectCalculateFields" resultMap="BaseResultMap">
+    select cm_currency,cm_rate,sum(cm_endamount) cm_endamount,sum(cm_endpreamount) cm_endpreamount from
+    (
+      select a.*,cr_rate cm_rate from custmonth a
+      left join currencys on cr_name = a.cm_currency and currencys.companyId = a.companyid
+      <where>
+        <if test="con != null">
+          ${con}
+        </if>
+        <if test="companyId != null">
+          and  a.companyId = #{companyId} and abs(cm_beginamount)+abs(cm_beginpreamount)+abs(cm_nowamount)+abs(cm_nowpreamount)+abs(cm_nowprepayamount)+abs(cm_nowpayamount)>0
+        </if>
+      </where>
+    ) x
+    group by cm_currency,cm_rate
+  </select>
+
   <select id="selectByCondition" resultMap="BaseResultMap">
       select  a.*,cr_rate cm_rate, cr_rate*(cm_endamount-cm_endpreamount) cm_amount_cr from custmonth a
       left join currencys on cr_name = a.cm_currency and currencys.companyId = a.companyid

applications/money/money-server/src/main/resources/mapper/ProfitdetailMapper.xml

@@ -25,10 +25,10 @@
 		  pi_custid,
 		  pi_custcode,
 		  pi_custname,
-		  sum(pd_sendprice*pi_rate) as saamount,
-		  sum(pd_price) as costamount,
-	  	  sum(pd_sendprice*pi_rate)-sum(pd_price) as profit,
-		  (sum(pd_sendprice*pi_rate)-sum(pd_price) )/sum(pd_sendprice*pi_rate) as profitpresent
+		  sum(pd_sendprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as saamount,
+		  sum(pd_total) as costamount,
+	  	  sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) as profit,
+		  (sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) )/sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as profitpresent
 	  from prodiodetail
 	  left join prodinout on pd_piid=pi_Id
 	  left join customer on cu_id = pi_custid
@@ -48,29 +48,29 @@
 	<select id="selectCalculateFields" resultType="string">
 		SELECT ${fields}
 		from(
-		select
-		cu_type,
-		pi_custid,
-		pi_custcode,
-		pi_custname,
-		sum(pd_sendprice*pi_rate) as saamount,
-		sum(pd_price) as costamount,
-		sum(pd_sendprice*pi_rate)-sum(pd_price) as profit,
-		(sum(pd_sendprice*pi_rate)-sum(pd_price) )/sum(pd_sendprice*pi_rate) as profitpresent
-		from prodiodetail
-		left join prodinout on pd_piid=pi_Id
-		left join customer on cu_id = pi_custid
-		<where>
-			<if test="con != null">
-				${con}
-			</if>
-			<if test="companyId != null">
-				and prodinout.companyid = #{companyId}
-			</if>
-			and pi_class in('出货单','销售退货单')
-		</where>
-		group by pi_custid,pi_custcode,pi_custname,cu_type
-		ORDER BY pi_custname asc
+			select
+				cu_type,
+				pi_custid,
+				pi_custcode,
+				pi_custname,
+				sum(pd_sendprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as saamount,
+				sum(pd_total) as costamount,
+				sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) as profit,
+				(sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))-sum(pd_total) )/sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as profitpresent
+			from prodiodetail
+			left join prodinout on pd_piid=pi_Id
+			left join customer on cu_id = pi_custid
+			<where>
+				<if test="con != null">
+					${con}
+				</if>
+				<if test="companyId != null">
+					and prodinout.companyid = #{companyId}
+				</if>
+				and pi_class in('出货单','销售退货单')
+			</where>
+			group by pi_custid,pi_custcode,pi_custname,cu_type
+			ORDER BY pi_custname asc
 		) a
 	</select>
 

applications/money/money-server/src/main/resources/mapper/VendmonthMapper.xml

@@ -19,6 +19,7 @@
     <result column="vm_nowprepayamount" property="vm_nowprepayamount" jdbcType="DOUBLE" />
     <result column="vm_endpreamount" property="vm_endpreamount" jdbcType="DOUBLE" />
     <result column="vm_currency" property="vm_currency" jdbcType="VARCHAR" />
+    <result column="vm_rate" property="vm_rate" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     vm_id, vm_yearmonth, vm_vendid, VM_VENDCODE, VM_VENDNAME, VM_BEGINAMOUNT, VM_NOWAMOUNT, 
@@ -39,6 +40,24 @@
     order by vm_yearmonth desc,vm_vendcode
   </select>
 
+  <select id="selectCalculateFields" resultMap="BaseResultMap">
+    select vm_currency,vm_rate,sum(vm_endamount) vm_endamount,sum(vm_endpreamount) vm_endpreamount from
+    (
+      select a.*,cr_rate vm_rate from vendmonth a
+      left join currencys on cr_name = a.vm_currency and currencys.companyId = a.companyid
+      <where>
+        <if test="con != null">
+          ${con}
+        </if>
+        <if test="companyId != null">
+          and a.companyid = #{companyId} and
+          abs(vm_beginamount)+abs(vm_beginpreamount)+abs(vm_nowamount)+abs(vm_nowpreamount)+abs(vm_nowprepayamount)+abs(vm_nowpayamount)>0
+        </if>
+      </where>
+    ) x
+    group by vm_currency,vm_rate
+  </select>
+
   <parameterMap id="ymParamMap" type="java.util.Map">
     <parameter property="v_YearMonth" jdbcType="INTEGER" mode="IN" />
     <parameter property="v_YearMonthTo" jdbcType="INTEGER" mode="IN" />

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseReportMapper.java

@@ -11,7 +11,7 @@ public interface PurchaseReportMapper {
 
     List<PurchaseReportDetail> selectDetailByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 
-    String selectPurchasePayCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+    List<PurchasePay> selectPurchasePayCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 
     String selectDetailCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/report/PurchasePay.java

@@ -43,4 +43,6 @@ public class PurchasePay  extends CommonBaseEntity implements Serializable {
     private String pb_manname;
 
     private String pi_currency;
+
+    private Double pi_rate;
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseReportServiceImpl.java

@@ -8,6 +8,7 @@ import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.mapper.PurchaseReportMapper;
+import com.usoftchina.saas.purchase.po.report.PurchasePay;
 import com.usoftchina.saas.purchase.service.PurchaseReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,7 +36,7 @@ public class PurchaseReportServiceImpl implements PurchaseReportService{
         Long companyId = BaseContextHolder.getCompanyId();
         String con = req.getFinalCondition();
         String calculateFieldsSql = req.getCalculateFieldsSql();
-        JSONArray arr = null;
+        List<PurchasePay> arr = null;
         if (null == con) {
             con = "1=1";
         }
@@ -44,11 +45,7 @@ public class PurchaseReportServiceImpl implements PurchaseReportService{
         PageInfo pageInfo = new PageInfo(list);
         //取对应计算数据
         if (!StringUtils.isEmpty(calculateFieldsSql)) {
-            String res = purchaseReportMapper.selectPurchasePayCalculateFields(calculateFieldsSql, con, companyId);
-            try {
-                arr = JSONArray.parseArray(res);
-            } catch (Exception e) {
-            }
+            arr = purchaseReportMapper.selectPurchasePayCalculateFields(calculateFieldsSql, con, companyId);
         }
         map.put("list", pageInfo);
         map.put("calculate", arr);

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseReportMapper.xml

@@ -22,6 +22,7 @@
     <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
     <result column="pb_manname" property="pb_manname" jdbcType="VARCHAR"/>
     <result column="pi_currency" property="pi_currency" jdbcType="VARCHAR"/>
+    <result column="pi_rate" property="pi_rate" jdbcType="DOUBLE"/>
   </resultMap>
   <resultMap id="ListMap" type="com.usoftchina.saas.purchase.po.report.PurchaseReportDetail">
     <id column="pu_id" property="pu_id" jdbcType="INTEGER" />
@@ -134,8 +135,9 @@
   </select>
 
 
-  <select id="selectPurchasePayCalculateFields" resultType="string">
-    select   ${fields}  from purchasepay_view
+  <select id="selectPurchasePayCalculateFields" resultMap="BaseResultMap">
+    select   pi_currency,pi_rate,sum(pbd_nowbalance) pbd_nowbalance,sum(pi_total) pi_total,sum(pi_nettotal) pi_nettotal from
+    purchasepay_view
     <where>
       <if test="con != null">
         ${con}
@@ -144,7 +146,7 @@
         and  companyId = #{companyId}
       </if>
     </where>
-    order by pb_id desc
+    group by pi_currency,pi_rate;
   </select>
 
   <select id="selectDetailCalculateFields" resultType="string">

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/SalerecViewMapper.java

@@ -9,5 +9,5 @@ public interface SalerecViewMapper {
 
     List<SalerecView> selectByCondition(@Param("con") String con, @Param("companyId") Long companyId);
 
-    String selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
+    List<SalerecView> selectCalculateFields(@Param("fields") String fields, @Param("con") String con, @Param("companyId") Long companyId);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/report/SalerecView.java

@@ -43,4 +43,6 @@ public class SalerecView {
     private Double pi_nettotal;
 
     private String pi_currency;
+
+    private Double pi_rate;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleReportServiceImpl.java

@@ -10,6 +10,7 @@ import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sale.mapper.SaleListMapper;
 import com.usoftchina.saas.sale.mapper.SaleProfitViewMapper;
 import com.usoftchina.saas.sale.mapper.SalerecViewMapper;
+import com.usoftchina.saas.sale.po.report.SalerecView;
 import com.usoftchina.saas.sale.service.SaleReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -69,7 +70,7 @@ public class SaleReportServiceImpl implements SaleReportService{
         Long companyId = BaseContextHolder.getCompanyId();
         String con = req.getFinalCondition();
         String calculateFieldsSql = req.getCalculateFieldsSql();
-        JSONArray arr = null;
+        List<SalerecView> arr = null;
         if (null == con) {
             con = "1=1";
         }
@@ -78,11 +79,7 @@ public class SaleReportServiceImpl implements SaleReportService{
         PageInfo pageInfo = new PageInfo(list);
         //取对应计算数据
         if (!StringUtils.isEmpty(calculateFieldsSql)) {
-            String res = salerecViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
-            try {
-                arr = JSONArray.parseArray(res);
-            } catch (Exception e) {
-            }
+            arr = salerecViewMapper.selectCalculateFields(calculateFieldsSql, con, companyId);
         }
         map.put("list", pageInfo);
         map.put("calculate", arr);

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -759,19 +759,24 @@ public class SaleServiceImpl implements SaleService{
         }
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         //Long userUU = 1000002503L, enUU = 10041559L;
-        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, remindReqDTO.getPageNumber(),
-                remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
-                remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
-        List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
-        if (CollectionUtils.isEmpty(inquiryEnRemindList)){
-            return null;
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = null;
+        if (remindReqDTO.getQuoted() != 1) {
+            inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, remindReqDTO.getPageNumber(),
+                    remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
+                    remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
+            List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
+            if (CollectionUtils.isEmpty(inquiryEnRemindList)) {
+                return null;
+            }
+            List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryEnRemindList), "enterprise");
+            //转换成分页对象
+            IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryEnRemindIPage.getNumber(), inquiryEnRemindIPage.getSize(),
+                    inquiryEnRemindIPage.getNumberOfElements(), remindRspDTOList, inquiryEnRemindIPage.isFirst(), inquiryEnRemindIPage.isLast(),
+                    inquiryEnRemindIPage.getTotalElements());
+            return remindRspDTOIPage;
+        }else {
+            return getRemindRspDTO(enUU, userUU, remindReqDTO);
         }
-        List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryEnRemindList), "enterprise");
-        //转换成分页对象
-        IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryEnRemindIPage.getNumber(), inquiryEnRemindIPage.getSize(),
-                inquiryEnRemindIPage.getNumberOfElements(),remindRspDTOList, inquiryEnRemindIPage.isFirst(), inquiryEnRemindIPage.isLast(),
-                inquiryEnRemindIPage.getTotalElements());
-        return remindRspDTOIPage;
     }
 
     /**
@@ -783,19 +788,100 @@ public class SaleServiceImpl implements SaleService{
     public IPage<RemindRspDTO> findRemindByUserInfo(RemindReqDTO remindReqDTO) {
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
-        IPage<InquiryRemind> inquiryRemindIpage = inquiryApi.findRemindByUserInfo(userUU, enUU, remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(),
-                remindReqDTO.getEnableOffer(),remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
-                remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
-        List<InquiryRemind> inquiryRemindList = inquiryRemindIpage.getContent();
-        if (CollectionUtils.isEmpty(inquiryRemindList)){
-            return null;
+        if (remindReqDTO.getQuoted() != 1) {
+            IPage<InquiryRemind> inquiryRemindIpage = inquiryApi.findRemindByUserInfo(userUU, enUU, remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(),
+                    remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
+                    remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
+            List<InquiryRemind> inquiryRemindList = inquiryRemindIpage.getContent();
+            if (CollectionUtils.isEmpty(inquiryRemindList)) {
+                return null;
+            }
+            List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryRemindList), "personal");
+            //转换成分页对象
+            IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryRemindIpage.getNumber(), inquiryRemindIpage.getSize(),
+                    inquiryRemindIpage.getNumberOfElements(), remindRspDTOList, inquiryRemindIpage.isFirst(), inquiryRemindIpage.isLast(),
+                    inquiryRemindIpage.getTotalElements());
+            return remindRspDTOIPage;
+        }else {
+            return getRemindRspDTO(enUU, userUU, remindReqDTO);
+        }
+    }
+
+    /**
+     * 查询已报过价的商机
+     * @param enUU              企业UU
+     * @param userUU            个人UU,企业商机传入userUU=null
+     * @param remindReqDTO
+     * @return
+     */
+    private IPage<RemindRspDTO> getRemindRspDTO(Long enUU, Long userUU, RemindReqDTO remindReqDTO){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("userUU", userUU);
+        jsonObject.put("enUU", enUU);
+        jsonObject.put("fromDate", remindReqDTO.getFromDate());
+        jsonObject.put("endDate", remindReqDTO.getEndDate());
+        jsonObject.put("fromDelivery", null);
+        jsonObject.put("endDelivery", null);
+        String filter = jsonObject.toJSONString();
+        IPage<PublicInquiryItemInfo> publicInquiryItemInfoIPage = inquiryApi.findQuotationList(remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(), remindReqDTO.getKeyword(), "done", 1, filter);
+        List<PublicInquiryItemInfo> publicInquiryItemInfoList = publicInquiryItemInfoIPage.getContent();
+        List<RemindRspDTO> remindRspDTOList = new ArrayList<>();
+        RemindRspDTO remindRspDTO = null;
+
+        for (PublicInquiryItemInfo publicInquiryItemInfo : publicInquiryItemInfoList) {
+            remindRspDTO = new RemindRspDTO();
+            //询价单信息
+            PublicInquiryInfo publicInquiryInfo = publicInquiryItemInfo.getInquiry();
+            if (!ObjectUtils.isEmpty(publicInquiryInfo)) {
+                remindRspDTO.setCustName(publicInquiryInfo.getEnName());
+            }
+            Product product = publicInquiryItemInfo.getProduct();
+            if (!ObjectUtils.isEmpty(product)) {
+                remindRspDTO.setProdBrand(product.getBrand());
+                remindRspDTO.setProdName(product.getTitle());
+                remindRspDTO.setProdOrispeccode(product.getCmpCode());
+                remindRspDTO.setProdSpec(product.getSpec());
+                remindRspDTO.setProdUnit(StringUtils.isEmpty(product.getUnit()) ? "PCS" : product.getUnit());
+            }
+
+            remindRspDTO.setNeedQty(publicInquiryItemInfo.getNeedquantity());
+            remindRspDTO.setStartDate(publicInquiryItemInfo.getDate());
+            remindRspDTO.setEndDate(publicInquiryItemInfo.getEndDate());
+            remindRspDTO.setQuoted(1);
+            remindRspDTO.setUserName(publicInquiryItemInfo.getUserName());
+            remindRspDTO.setUserTel(publicInquiryItemInfo.getUserTel());
+            remindRspDTO.setUserUU(publicInquiryItemInfo.getUserUU());
+            remindRspDTO.setSourceId(publicInquiryItemInfo.getSourceId());
+            remindRspDTO.setEnUU(publicInquiryInfo.getEnUU());
+            remindRspDTO.setRecorderUU(publicInquiryItemInfo.getUserUU());
+            remindRspDTO.setInquiryCode(publicInquiryInfo.getCode());
+            remindRspDTO.setInquiryId(publicInquiryInfo.getId());
+
+            QuotationRspDTO quotationRspDTO = new QuotationRspDTO();
+            quotationRspDTO.setAgreed(publicInquiryItemInfo.getAgreed());
+            quotationRspDTO.setRefusereason(publicInquiryItemInfo.getRefusereason());
+            quotationRspDTO.setLeadTime(publicInquiryItemInfo.getLeadtime());
+            quotationRspDTO.setTaxRate(new BigDecimal(publicInquiryItemInfo.getTaxrate()).doubleValue());
+            //分段报价明细
+            List<InquiryReplayDTO> inquiryReplayDTOList = new ArrayList<InquiryReplayDTO>();
+            List<PublicInquiryReplyInfo> publicInquiryReplyList = publicInquiryItemInfo.getReplies();
+            if (!CollectionUtils.isEmpty(publicInquiryReplyList)) {
+                for (PublicInquiryReplyInfo publicInquiryReplyInfo : publicInquiryReplyList) {
+                    InquiryReplayDTO inquiryReplayDTO = new InquiryReplayDTO(publicInquiryReplyInfo.getId(), publicInquiryReplyInfo.getLapQty(), publicInquiryReplyInfo.getPrice());
+                    inquiryReplayDTOList.add(inquiryReplayDTO);
+                }
+            }
+            quotationRspDTO.setReplies(inquiryReplayDTOList);
+            remindRspDTO.setQutations(quotationRspDTO);
+
+            remindRspDTOList.add(remindRspDTO);
         }
-        List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryRemindList), "personal");
-        //转换成分页对象
-        IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryRemindIpage.getNumber(), inquiryRemindIpage.getSize(),
-                inquiryRemindIpage.getNumberOfElements(),remindRspDTOList, inquiryRemindIpage.isFirst(), inquiryRemindIpage.isLast(),
-                inquiryRemindIpage.getTotalElements());
-        return remindRspDTOIPage;
+        //构造回写数据
+        IPage<RemindRspDTO> Ipage = new IPage<RemindRspDTO>(publicInquiryItemInfoIPage.getNumber(), publicInquiryItemInfoIPage.getSize(),
+                publicInquiryItemInfoIPage.getNumberOfElements(), remindRspDTOList,
+                publicInquiryItemInfoIPage.isFirst(), publicInquiryItemInfoIPage.isLast(),
+                publicInquiryItemInfoIPage.getTotalElements());
+        return Ipage;
     }
 
     /**

applications/sale/sale-server/src/main/resources/mapper/SalerecViewMapper.xml

@@ -19,6 +19,7 @@
     <result column="pi_nettotal" property="pi_nettotal" jdbcType="DOUBLE" />
     <result column="pi_total" property="pi_total" jdbcType="DOUBLE" />
     <result column="pi_currency" property="pi_currency" jdbcType="VARCHAR" />
+    <result column="pi_rate" property="pi_rate" jdbcType="DOUBLE" />
   </resultMap>
   <select id="selectByCondition" resultMap="BaseResultMap">
     select  *  from Salerec_View
@@ -33,8 +34,9 @@
     order by rb_date desc
   </select>
 
-  <select id="selectCalculateFields" resultType="string">
-    select   ${fields}  from Salerec_View
+  <select id="selectCalculateFields" resultMap="BaseResultMap">
+    select   pi_currency,pi_rate,sum(rbd_nowbalance) rbd_nowbalance,sum(pi_total) pi_total,sum(pi_nettotal) pi_nettotal from
+    Salerec_View
     <where>
       <if test="con != null">
         ${con}
@@ -43,5 +45,6 @@
         and  companyId = #{companyId}
       </if>
     </where>
+    group by pi_currency,pi_rate
   </select>
 </mapper>

applications/transfers/mall-api/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <scope>test</scope>
         </dependency>
+      <dependency>
+        <groupId>com.alibaba</groupId>
+        <artifactId>fastjson</artifactId>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
 
 </project>

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/InquiryApi.java

@@ -1,11 +1,9 @@
 package com.usoftchina.saas.inquiry.api;
 
-import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.exception.ExceptionCode;
+import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItemInfo;
 import com.usoftchina.saas.inquiry.po.inquiry.*;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
@@ -63,6 +61,28 @@ public interface InquiryApi {
                                               @RequestParam("quoted") Integer quoted, @RequestParam("fromDate") Long fromDate,
                                               @RequestParam("endDate") Long endDate);
 
+    /**
+     * 查看已报价列表
+     * @param pageNumber    页码
+     * @param pageSize      每页大小
+     * @param keyword       关键字
+     * @param _state        状态  已报价 为 done
+     * @param overdue       为空或不等于1时，只查看未过报价截止日期，为1时，查看所有已报价
+     * @param filter
+     *          <p> userUU          用户UU 不为空时，只查看此用户报价的单      </p>
+     *          <p> fromDate        筛选报价时间 开始                       </p>
+     *          <p> endDate         筛选报价时间 结束                       </p>
+     *          <p> fromDelivery    发布时间筛选 开始                       </p>
+     *          <p> endDelivery     发布时间筛选 结束                       </p>
+     *          <p> enUU            企业UU报价企业UU                       </p>
+     * @return
+     */
+    @GetMapping("/public/quotation/list")
+    IPage<PublicInquiryItemInfo> findQuotationList(@RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
+                                                   @RequestParam("keyword") String keyword, @RequestParam("_state") String _state,
+                                                   @RequestParam("overdue") Integer overdue, @RequestParam("filter") String filter);
+
+
     /**
      * 保存报价接口
      * @param publicInquiryItem 报价单内容

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryInfo.java

@@ -0,0 +1,249 @@
+package com.usoftchina.saas.inquiry.po.inquiry;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+
+/**
+ *  公共询价单主表
+ *    <pre>
+ *        这里是公共询价转成报价后存的数据信息，与以前的采购询价分开
+ *    </pre>
+ * @Author chenwei
+ * @Date 2019-03-25
+ */
+public class PublicInquiryInfo implements Serializable {
+
+    private Long id;
+
+    /**
+     * 询价单所属企业UU
+     */
+    private Long enUU;
+
+    /**
+     * 询价企业名称（方便搜索）
+     */
+    private String enName;
+
+    /**
+     * 询价企业信息
+     */
+    private Enterprise enterprise;
+
+    /**
+     * 询价单所属用户UU
+     */
+    private Long recorderUU;
+
+    /**
+     * 流水号
+     */
+    private String code;
+
+    /**
+     * 单据归属日期
+     */
+    private Date date;
+
+    /**
+     * 录入人
+     */
+    private String recorder;
+
+    /**
+     * 报价截止日期
+     */
+    private Date endDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 环保要求
+     */
+    private String environment;
+
+    /**
+     * 询价明细
+     */
+    private Set<PublicInquiryItemInfo> inquiryItems;
+
+    /**
+     * 来源系统单据ID
+     */
+    private Long sourceId;
+
+    /**
+     * 是否过期
+     */
+    private Short overdue;
+
+    /**
+     * 应用来源，主要是为了平台公共询价做处理
+     */
+    private String sourceApp;
+
+    /**
+     * 收货地址
+     */
+    private String ship;
+
+    /**
+     * 是否开票<br>
+     * 1. 是<br>
+     * 0. 否
+     */
+    private Short invoice;
+
+    /**
+     * 询价类型
+     */
+    private String inquirytype;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public Long getRecorderUU() {
+        return recorderUU;
+    }
+
+    public void setRecorderUU(Long recorderUU) {
+        this.recorderUU = recorderUU;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getRecorder() {
+        return recorder;
+    }
+
+    public void setRecorder(String recorder) {
+        this.recorder = recorder;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getEnvironment() {
+        return environment;
+    }
+
+    public void setEnvironment(String environment) {
+        this.environment = environment;
+    }
+
+    public Set<PublicInquiryItemInfo> getInquiryItems() {
+        return inquiryItems;
+    }
+
+    public void setInquiryItems(Set<PublicInquiryItemInfo> inquiryItems) {
+        this.inquiryItems = inquiryItems;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public Short getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(Short overdue) {
+        this.overdue = overdue;
+    }
+
+    public String getSourceApp() {
+        return sourceApp;
+    }
+
+    public void setSourceApp(String sourceApp) {
+        this.sourceApp = sourceApp;
+    }
+
+    public String getShip() {
+        return ship;
+    }
+
+    public void setShip(String ship) {
+        this.ship = ship;
+    }
+
+    public Short getInvoice() {
+        return invoice;
+    }
+
+    public void setInvoice(Short invoice) {
+        this.invoice = invoice;
+    }
+
+    public String getInquirytype() {
+        return inquirytype;
+    }
+
+    public void setInquirytype(String inquirytype) {
+        this.inquirytype = inquirytype;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryItemInfo.java

@@ -0,0 +1,674 @@
+package com.usoftchina.saas.inquiry.po.inquiry;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author chenwei
+ * @Date 2019-03-25
+ */
+public class PublicInquiryItemInfo implements Serializable {
+    /**
+     * id
+     */
+    private Long id;
+    /**
+     * 来源（买家ERP采购询价明细）的ID
+     */
+    private Long sourceId;
+    /**
+     * 序号
+     */
+    private Short number;
+    /**
+     * 询价单
+     */
+    private PublicInquiryInfo inquiry;
+    /**
+     * 买家采购员UU
+     */
+    private Long userUU;
+    /**
+     * 联系人姓名
+     */
+    private String userName;
+    /**
+     * 联系人电话
+     */
+    private String userTel;
+    /**
+     * 产品id
+     */
+    private Long productId;
+    /**
+     * 产品
+     */
+    private Product product;
+    /**
+     * 币种
+     */
+    private String currency;
+    /**
+     * 税率
+     */
+    private Float taxrate;
+    /**
+     * 供应商UU
+     */
+    private Long vendUU;
+    /**
+     * 供应商企业信息
+     */
+    private Enterprise enterprise;
+    /**
+     * 供应商联系人UU
+     */
+    private Long vendUserUU;
+    /**
+     * （买家预先提供的）有效期始
+     */
+    private Date fromDate;
+    /**
+     * （卖家报的）最小订购量
+     */
+    private Double minOrderQty;
+    /**
+     * （卖家报的）最小包装量
+     */
+    private Double minPackQty;
+    /**
+     * （卖家报的）供应商物料编号
+     */
+    private String vendorprodcode;
+    /**
+     * （卖家报的）交货周期（天数）
+     */
+    private Long leadtime;
+    /**
+     * {未回复、已回复}
+     */
+    private Short status;
+    /**
+     * (针对买家的)报价信息传输状态{待上传、已下载}
+     */
+    private Short sendStatus;
+    /**
+     * (针对卖家的)报价信息传输状态{待上传、已下载}
+     */
+    private Short replySendStatus;
+    /**
+     * 是否采纳
+     */
+    private Short agreed;
+    /**
+     * (针对卖家的)是否采纳信息传输状态{待上传、已下载}
+     */
+    private Short decideStatus;
+    /**
+     * (针对卖家的)作废信息传输状态{待上传、已下载}
+     */
+    private Short invalidStatus;
+    /**
+     * 录入时间
+     */
+    private Date date;
+    /**
+     *  报价是否过期
+     */
+    private Short overdue;
+    /**
+     * 应用来源ERP、B2B
+     */
+    private String source;
+    /**
+     * 报价的应用
+     */
+    private String qutoApp;
+    /**
+     * 需求数量
+     */
+    private Double needquantity;
+    /**
+     * erp传输状态
+     *
+     * <pre>erp发出数据传输请求时，赋给状态，完成后更新状态</pre>
+     *
+     * 1、 传输完成<br>
+     * 0、 正在传输
+     *
+     */
+    private Short erpstatus;
+
+	/*这下面是供应商报价时存的相关信息；
+	* 因为存在非客户报价，而且公共服务里面没有企业信息，现存入相关字段，后续处理*/
+    /**
+     * 供应商名称
+     */
+    private String vendName;
+
+    /**
+     * 供应商营业执照
+     */
+    private String businessCode;
+
+    /**
+     * 报价时间
+     */
+    private Date offerTime;
+
+    /**
+     * 分段报价明细
+     */
+    private List<PublicInquiryReplyInfo> replies;
+
+    /**
+     * 截止日期
+     */
+    private Date endDate;
+
+
+    /**
+     * ************* 上传的物料信息，物料冗余字段 *************
+     */
+    /**
+     * 物料编号
+     */
+    private String prodCode;
+
+    /**
+     * 名称
+     */
+    private String prodTitle;
+
+    /**
+     * 规格
+     */
+    private String spec;
+
+    /**
+     * 型号
+     */
+    private String cmpCode;
+
+    /**
+     * 品牌
+     */
+    private String inbrand;
+    /**
+     * ******end*******
+     */
+
+    /**
+     * 剩余时间
+     */
+    private Long remainingTime;
+
+    /**
+     * 报价附件信息
+     */
+    private String attachUrl;
+
+    /**
+     * 报价附件名称
+     */
+    private String attachName;
+
+    /**
+     * 供应商企业信息
+     */
+    private User user;
+
+    /**
+     * 买家发出公共询价单时录入的币别
+     */
+    private String custCurrency;
+
+    /**
+     * 拒绝采纳理由
+     */
+    private String refusereason;
+
+    /******** 替代物料信息  */
+
+    /**
+     * 替代型号
+     */
+    private String replaceCmpCode;
+
+    /**
+     * 替代规格
+     */
+    private String replaceSpec;
+
+    /**
+     * 替代品牌
+     */
+    private String replaceBrand;
+
+    /**
+     * 是否替代物料报价  1 是替代料报价， 0为普通报价
+     */
+    private Short isReplace = 0;
+
+    /**
+     * 总计价格（用于商城bom求购明细价格分析  dongbw  2018年9月5日 14:59:48）
+     */
+    private Double sumPrice;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public Short getNumber() {
+        return number;
+    }
+
+    public void setNumber(Short number) {
+        this.number = number;
+    }
+
+    public PublicInquiryInfo getInquiry() {
+        return inquiry;
+    }
+
+    public void setInquiry(PublicInquiryInfo inquiry) {
+        this.inquiry = inquiry;
+    }
+
+    public Long getUserUU() {
+        return userUU;
+    }
+
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public Product getProduct() {
+        return product;
+    }
+
+    public void setProduct(Product product) {
+        this.product = product;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public Float getTaxrate() {
+        return taxrate;
+    }
+
+    public void setTaxrate(Float taxrate) {
+        this.taxrate = taxrate;
+    }
+
+    public Long getVendUU() {
+        return vendUU;
+    }
+
+    public void setVendUU(Long vendUU) {
+        this.vendUU = vendUU;
+    }
+
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public Long getVendUserUU() {
+        return vendUserUU;
+    }
+
+    public void setVendUserUU(Long vendUserUU) {
+        this.vendUserUU = vendUserUU;
+    }
+
+    public Date getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(Date fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public Double getMinOrderQty() {
+        return minOrderQty;
+    }
+
+    public void setMinOrderQty(Double minOrderQty) {
+        this.minOrderQty = minOrderQty;
+    }
+
+    public Double getMinPackQty() {
+        return minPackQty;
+    }
+
+    public void setMinPackQty(Double minPackQty) {
+        this.minPackQty = minPackQty;
+    }
+
+    public String getVendorprodcode() {
+        return vendorprodcode;
+    }
+
+    public void setVendorprodcode(String vendorprodcode) {
+        this.vendorprodcode = vendorprodcode;
+    }
+
+    public Long getLeadtime() {
+        return leadtime;
+    }
+
+    public void setLeadtime(Long leadtime) {
+        this.leadtime = leadtime;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public Short getSendStatus() {
+        return sendStatus;
+    }
+
+    public void setSendStatus(Short sendStatus) {
+        this.sendStatus = sendStatus;
+    }
+
+    public Short getReplySendStatus() {
+        return replySendStatus;
+    }
+
+    public void setReplySendStatus(Short replySendStatus) {
+        this.replySendStatus = replySendStatus;
+    }
+
+    public Short getAgreed() {
+        return agreed;
+    }
+
+    public void setAgreed(Short agreed) {
+        this.agreed = agreed;
+    }
+
+    public Short getDecideStatus() {
+        return decideStatus;
+    }
+
+    public void setDecideStatus(Short decideStatus) {
+        this.decideStatus = decideStatus;
+    }
+
+    public Short getInvalidStatus() {
+        return invalidStatus;
+    }
+
+    public void setInvalidStatus(Short invalidStatus) {
+        this.invalidStatus = invalidStatus;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public Short getOverdue() {
+        return overdue;
+    }
+
+    public void setOverdue(Short overdue) {
+        this.overdue = overdue;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getQutoApp() {
+        return qutoApp;
+    }
+
+    public void setQutoApp(String qutoApp) {
+        this.qutoApp = qutoApp;
+    }
+
+    public Double getNeedquantity() {
+        return needquantity;
+    }
+
+    public void setNeedquantity(Double needquantity) {
+        this.needquantity = needquantity;
+    }
+
+    public Short getErpstatus() {
+        return erpstatus;
+    }
+
+    public void setErpstatus(Short erpstatus) {
+        this.erpstatus = erpstatus;
+    }
+
+    public String getVendName() {
+        return vendName;
+    }
+
+    public void setVendName(String vendName) {
+        this.vendName = vendName;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public Date getOfferTime() {
+        return offerTime;
+    }
+
+    public void setOfferTime(Date offerTime) {
+        this.offerTime = offerTime;
+    }
+
+    public List<PublicInquiryReplyInfo> getReplies() {
+        return replies;
+    }
+
+    public void setReplies(List<PublicInquiryReplyInfo> replies) {
+        this.replies = replies;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getProdCode() {
+        return prodCode;
+    }
+
+    public void setProdCode(String prodCode) {
+        this.prodCode = prodCode;
+    }
+
+    public String getProdTitle() {
+        return prodTitle;
+    }
+
+    public void setProdTitle(String prodTitle) {
+        this.prodTitle = prodTitle;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getCmpCode() {
+        return cmpCode;
+    }
+
+    public void setCmpCode(String cmpCode) {
+        this.cmpCode = cmpCode;
+    }
+
+    public String getInbrand() {
+        return inbrand;
+    }
+
+    public void setInbrand(String inbrand) {
+        this.inbrand = inbrand;
+    }
+
+    public Long getRemainingTime() {
+        return remainingTime;
+    }
+
+    public void setRemainingTime(Long remainingTime) {
+        this.remainingTime = remainingTime;
+    }
+
+    public String getAttachUrl() {
+        return attachUrl;
+    }
+
+    public void setAttachUrl(String attachUrl) {
+        this.attachUrl = attachUrl;
+    }
+
+    public String getAttachName() {
+        return attachName;
+    }
+
+    public void setAttachName(String attachName) {
+        this.attachName = attachName;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getCustCurrency() {
+        return custCurrency;
+    }
+
+    public void setCustCurrency(String custCurrency) {
+        this.custCurrency = custCurrency;
+    }
+
+    public String getRefusereason() {
+        return refusereason;
+    }
+
+    public void setRefusereason(String refusereason) {
+        this.refusereason = refusereason;
+    }
+
+    public String getReplaceCmpCode() {
+        return replaceCmpCode;
+    }
+
+    public void setReplaceCmpCode(String replaceCmpCode) {
+        this.replaceCmpCode = replaceCmpCode;
+    }
+
+    public String getReplaceSpec() {
+        return replaceSpec;
+    }
+
+    public void setReplaceSpec(String replaceSpec) {
+        this.replaceSpec = replaceSpec;
+    }
+
+    public String getReplaceBrand() {
+        return replaceBrand;
+    }
+
+    public void setReplaceBrand(String replaceBrand) {
+        this.replaceBrand = replaceBrand;
+    }
+
+    public Short getIsReplace() {
+        return isReplace;
+    }
+
+    public void setIsReplace(Short isReplace) {
+        this.isReplace = isReplace;
+    }
+
+    public Double getSumPrice() {
+        return sumPrice;
+    }
+
+    public void setSumPrice(Double sumPrice) {
+        this.sumPrice = sumPrice;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryReplyInfo.java

@@ -0,0 +1,52 @@
+package com.usoftchina.saas.inquiry.po.inquiry;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 公共询价单报价明细
+ * @Author chenwei
+ * @Date 2019-03-25
+ */
+public class PublicInquiryReplyInfo implements Serializable {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * （买家或卖家定义的）分段数量
+     */
+    private Double lapQty;
+
+    /**
+     * （卖家报的）单价
+     */
+    private Double price;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Double getLapQty() {
+        return lapQty;
+    }
+
+    public void setLapQty(Double lapQty) {
+        this.lapQty = lapQty;
+    }
+
+    public Double getPrice() {
+        return price;
+    }
+
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+}

applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/InquiryApiTest.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.inquiry.test;
 
+import com.alibaba.fastjson.JSONObject;
 import com.usoftchina.saas.inquiry.api.InquiryApi;
 import com.usoftchina.saas.inquiry.po.inquiry.*;
 import com.usoftchina.saas.utils.JsonUtils;
@@ -194,4 +195,18 @@ public class InquiryApiTest {
             System.out.println("result3: " + sb);
         }
     }
+
+    @Test
+    public void testI_findQuotationList(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("userUU", null);
+        jsonObject.put("enUU", "10050690");
+        jsonObject.put("fromDate", null);
+        jsonObject.put("endDate", null);
+        jsonObject.put("fromDelivery", null);
+        jsonObject.put("endDelivery", null);
+        String filter = jsonObject.toJSONString();
+        IPage<PublicInquiryItemInfo> publicInquiryItemInfoIPage = inquiryApi.findQuotationList(1, 10, null, "done", 1, filter);
+        System.out.println(JsonUtils.toJsonString(publicInquiryItemInfoIPage));
+    }
 }

frontend/saas-web/app/model/report/SaleProfit.js

@@ -26,17 +26,6 @@ Ext.define('saas.model.report.SaleProfit', {
             depends: ['pd_ordertotal', 'pd_nettotal']
         }, 
         { name: 'pd_ordertotal', type: 'float' },//价税合计
-        { name: 'pd_ordertotal*pi_rate', type: 'float' ,
-            convert: function(v, rec) {
-                return Number(saas.util.BaseUtil.numberFormat((rec.get('pd_ordertotal') || 0.0), 2, false));
-            },
-            depends: ['pd_ordertotal']
-            /* convert: function(v, rec) {
-                var t = (rec.get('pd_ordertotal') || 0.0) * (rec.get('pi_rate') || 1.0);
-                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
-            },
-            depends: ['pd_ordertotal', 'pi_rate'] */
-        },//价税合计本位币
         { name: 'pd_price', type: 'float' },//成本单价
         { name: 'pd_total', type: 'float' },
         { name: 'pd_profit', type: 'float' },

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -132,7 +132,7 @@ Ext.define('saas.view.money.report.PayDetail', {
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
-        summaryType: 'sum',
+        summaryType: 'customize_last',
         disableMySummary:true,
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
@@ -153,7 +153,20 @@ Ext.define('saas.view.money.report.PayDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         mySummaryRenderer: function(grid, column, datas) {
-            return grid.store.sum(column.dataIndex)
+            let sum = 0;
+            Ext.each(grid.store.data.items,function(rec,index){
+                if((index+1)<grid.store.data.items.length){
+                    //校验是否变更了数据
+                    let nowGroup = rec.get('groupfield')
+                    let nextGroup = grid.store.data.items[index+1].get('groupfield')
+                    if(nowGroup!=nextGroup){
+                        sum+=rec.get('pd_remain')*rec.get('pd_rate')
+                    }
+                }else{
+                    sum+=rec.get('pd_remain')*rec.get('pd_rate')
+                }
+            });
+            return saas.util.BaseUtil.numberFormat(sum, 2, true);
         }
     }, {
         dataIndex: '',

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -134,7 +134,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         disableMySummary:true,
-        summaryType: 'sum',
+        summaryType: 'customize_last',
         summaryRenderer: function(v, d, f, m) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
@@ -154,7 +154,20 @@ Ext.define('saas.view.money.report.RecDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         mySummaryRenderer: function(grid, column, datas) {
-            return grid.store.sum(column.dataIndex)
+            let sum = 0;
+            Ext.each(grid.store.data.items,function(rec,index){
+                if((index+1)<grid.store.data.items.length){
+                    //校验是否变更了数据
+                    let nowGroup = rec.get('groupfield')
+                    let nextGroup = grid.store.data.items[index+1].get('groupfield')
+                    if(nowGroup!=nextGroup){
+                        sum+=rec.get('rd_remain')*rec.get('rd_rate')
+                    }
+                }else{
+                    sum+=rec.get('rd_remain')*rec.get('rd_rate')
+                }
+            });
+            return saas.util.BaseUtil.numberFormat(sum, 2, true);
         }
     }, {
         dataIndex: '',

frontend/saas-web/app/view/money/report/TotalPayDetail.js

@@ -159,5 +159,83 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     }, {
         dataIndex: '',
         flex: 1
-    }]
+    }],
+    
+    // 自定义合计逻辑，直接使用后台返回的内容作为合计栏内容
+    mySummaryConfig: {
+        renderSummaryData: [],
+        mySummaryTpl: [
+            '<table class="x-grid-row-mysummary x-mmmmmmmmmmmm">',
+                '<tbody>',
+                    '<tr>',
+                        '<tpl for=".">',
+                        '<td class="x-grid-cell x-grid-td x-grid-cell-numbercolumn-1526 x-unselectable x-mysummary-item">',
+                            '<div class="x-grid-cell-inner x-mysummary-item-cell">{label}',
+                                '{str}',
+                            '</div>',
+                        '</td>',
+                        '</tpl>',
+                    '</tr>',
+                '</tbody>',
+            '</table>',
+        ],
+        initSummarys: function() {
+            var me = this,
+            summaryData = me.renderSummaryData;
+            
+            var summarys = [{
+                str: summaryData
+            }];
+            this.summarys = summarys;
+            return summarys;
+        },
+        updateSummarys: function() {
+            var me = this,
+            summaryData = me.renderSummaryData;
+            var summarys = [{
+                str: summaryData
+            }];
+            this.summarys = summarys;
+            return summarys;
+        },
+        applySummarys: function(response) {
+            var me = this,
+            grid = me.grid;
+            var _res = response,
+            _calculateProperty = grid.calculateProperty;
+
+            var _root = _calculateProperty.split('.')[0];
+            eval('var ' + _root + ' = _res[_root];');
+            try {
+                summaryData = [];
+                try {
+                    summaryData = eval(_calculateProperty);
+
+                    if(!Ext.isArray(summaryData)) {
+                        summaryData = [];
+                    }
+                }catch(e) {
+                    // don't care this...
+                }
+                //自定义逻辑
+                if(summaryData.length>0){
+                    let message = '';
+                    Ext.each(summaryData,function(obj,index){
+                        recAmount = obj.vm_endamount-obj.vm_endpreamount
+                        if(index==0){
+                            message+='<span>应付余额(' + obj.vm_currency + ')(元):'+saas.util.BaseUtil.numberFormat(recAmount, 2, true)+'</span>'
+                        }else{
+                            message+='<span style="margin:0 0 0 20px">应付余额(' + obj.vm_currency + ')(元):'+saas.util.BaseUtil.numberFormat(recAmount, 2, true)+'</span>'
+                        }
+                    });
+                    me.renderSummaryData =message;
+                }else{
+                    me.renderSummaryData = '';
+                }
+            } catch (e) {
+                console.error(e);
+                saas.util.BaseUtil.showErrorToast(e.message);
+            }
+        }
+    }
 });

frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -156,5 +156,83 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
     }, {
         dataIndex: '',
         flex: 1
-    }]
+    }],
+
+    // 自定义合计逻辑，直接使用后台返回的内容作为合计栏内容
+    mySummaryConfig: {
+        renderSummaryData: [],
+        mySummaryTpl: [
+            '<table class="x-grid-row-mysummary x-mmmmmmmmmmmm">',
+                '<tbody>',
+                    '<tr>',
+                        '<tpl for=".">',
+                        '<td class="x-grid-cell x-grid-td x-grid-cell-numbercolumn-1526 x-unselectable x-mysummary-item">',
+                            '<div class="x-grid-cell-inner x-mysummary-item-cell">{label}',
+                                '{str}',
+                            '</div>',
+                        '</td>',
+                        '</tpl>',
+                    '</tr>',
+                '</tbody>',
+            '</table>',
+        ],
+        initSummarys: function() {
+            var me = this,
+            summaryData = me.renderSummaryData;
+            
+            var summarys = [{
+                str: summaryData
+            }];
+            this.summarys = summarys;
+            return summarys;
+        },
+        updateSummarys: function() {
+            var me = this,
+            summaryData = me.renderSummaryData;
+            var summarys = [{
+                str: summaryData
+            }];
+            this.summarys = summarys;
+            return summarys;
+        },
+        applySummarys: function(response) {
+            var me = this,
+            grid = me.grid;
+            var _res = response,
+            _calculateProperty = grid.calculateProperty;
+
+            var _root = _calculateProperty.split('.')[0];
+            eval('var ' + _root + ' = _res[_root];');
+            try {
+                summaryData = [];
+                try {
+                    summaryData = eval(_calculateProperty);
+
+                    if(!Ext.isArray(summaryData)) {
+                        summaryData = [];
+                    }
+                }catch(e) {
+                    // don't care this...
+                }
+                //自定义逻辑
+                if(summaryData.length>0){
+                    let message = '';
+                    Ext.each(summaryData,function(obj,index){
+                        recAmount = obj.cm_endamount-obj.cm_endpreamount
+                        if(index==0){
+                            message+='<span>应收余额(' + obj.cm_currency + ')(元):'+saas.util.BaseUtil.numberFormat(recAmount, 2, true)+'</span>'
+                        }else{
+                            message+='<span style="margin:0 0 0 20px">应收余额(' + obj.cm_currency + ')(元):'+saas.util.BaseUtil.numberFormat(recAmount, 2, true)+'</span>'
+                        }
+                    });
+                    me.renderSummaryData =message;
+                }else{
+                    me.renderSummaryData = '';
+                }
+            } catch (e) {
+                console.error(e);
+                saas.util.BaseUtil.showErrorToast(e.message);
+            }
+        }
+    }
 });

frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -163,7 +163,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
             summaryData = me.renderSummaryData;
             
             var summarys = [{
-                str: JSON.stringify(summaryData)
+                str: summaryData
             }];
             this.summarys = summarys;
             return summarys;
@@ -172,7 +172,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
             var me = this,
             summaryData = me.renderSummaryData;
             var summarys = [{
-                str: JSON.stringify(summaryData)
+                str: summaryData
             }];
             this.summarys = summarys;
             return summarys;
@@ -196,7 +196,22 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
                 }catch(e) {
                     // don't care this...
                 }
-                me.renderSummaryData =summaryData;
+                //自定义逻辑
+                if(summaryData.length>0){
+                    let message = '';
+                    let tax = 0;//税额
+                    let payAmount = 0;//付款金额
+                    Ext.each(summaryData,function(obj,index){
+                        tax+=(obj.pi_total-obj.pi_nettotal)*obj.pi_rate
+                        payAmount = obj.pbd_nowbalance
+                        message+='<span style="margin:0 0 0 20px">付款金额(' + obj.pi_currency + ')(元):'+saas.util.BaseUtil.numberFormat(payAmount, 2, true)+'</span>'
+                    });
+                    message = '税额(本位币)(元):'+saas.util.BaseUtil.numberFormat(tax, 2, true)+message
+                    me.renderSummaryData =message;
+                }else{
+                    message = '税额(本位币)(元):0'
+                    me.renderSummaryData =message;
+                }
             } catch (e) {
                 console.error(e);
                 saas.util.BaseUtil.showErrorToast(e.message);

frontend/saas-web/app/view/sale/b2b/PurchaseDetail.js

@@ -228,9 +228,15 @@ Ext.define('saas.view.sale.b2b.PurchaseDetail', {
             toolBtns: [{
                 xtype: 'button',
                 text: '转销售',
+                bind:{
+                    hidden:'{hideButton}'
+                },
                 handler: 'turnSale',
             }, {
                 xtype: 'button',
+                bind:{
+                    hidden:'{hideButton}'
+                },
                 text: '更新',
                 handler: 'onSave',
             }]

frontend/saas-web/app/view/sale/b2b/PurchaseDetailModel.js

@@ -10,5 +10,14 @@ Ext.define('saas.view.sale.b2b.PurchaseDetailModel', {
         showAuditBtn: false, // 显示审核、反审核按钮
         showPrintBtn: false, // 显示打印按钮
         configurable: true, // 显示界面设置按钮
+    },
+
+    formulas:{
+        hideButton:{
+            bind:'{sa_statuscode}',
+            get:function(value){
+                return value == 'CLOSE';
+            }
+        }
     }
 });

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -193,7 +193,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         }
     }, {
         text: '毛利润(元)',
-        dataIndex: 'pd_profit*pi_rate',
+        dataIndex: 'pd_profit',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         renderer: function(v) {

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -146,6 +146,85 @@ Ext.define('saas.view.sale.report.SaleRec', {
         text: '备注',
         dataIndex: 'rb_remark',
         width: 250
-    }]
+    }],
+
+    // 自定义合计逻辑，直接使用后台返回的内容作为合计栏内容
+    mySummaryConfig: {
+        renderSummaryData: [],
+        mySummaryTpl: [
+            '<table class="x-grid-row-mysummary x-mmmmmmmmmmmm">',
+                '<tbody>',
+                    '<tr>',
+                        '<tpl for=".">',
+                        '<td class="x-grid-cell x-grid-td x-grid-cell-numbercolumn-1526 x-unselectable x-mysummary-item">',
+                            '<div class="x-grid-cell-inner x-mysummary-item-cell">{label}',
+                                '{str}',
+                            '</div>',
+                        '</td>',
+                        '</tpl>',
+                    '</tr>',
+                '</tbody>',
+            '</table>',
+        ],
+        initSummarys: function() {
+            var me = this,
+            summaryData = me.renderSummaryData;
+            
+            var summarys = [{
+                str: summaryData
+            }];
+            this.summarys = summarys;
+            return summarys;
+        },
+        updateSummarys: function() {
+            var me = this,
+            summaryData = me.renderSummaryData;
+            var summarys = [{
+                str: summaryData
+            }];
+            this.summarys = summarys;
+            return summarys;
+        },
+        applySummarys: function(response) {
+            var me = this,
+            grid = me.grid;
+            var _res = response,
+            _calculateProperty = grid.calculateProperty;
+
+            var _root = _calculateProperty.split('.')[0];
+            eval('var ' + _root + ' = _res[_root];');
+            try {
+                summaryData = [];
+                try {
+                    summaryData = eval(_calculateProperty);
+
+                    if(!Ext.isArray(summaryData)) {
+                        summaryData = [];
+                    }
+                }catch(e) {
+                    // don't care this...
+                }
+                //自定义逻辑
+                if(summaryData.length>0){
+                    let message = '';
+                    let tax = 0;//税额
+                    let recAmount = 0;//收款金额
+                    Ext.each(summaryData,function(obj,index){
+                        tax+=(obj.pi_total-obj.pi_nettotal)*obj.pi_rate
+                        recAmount = obj.rbd_nowbalance
+                        message+='<span style="margin:0 0 0 20px">收款金额(' + obj.pi_currency + ')(元):'+saas.util.BaseUtil.numberFormat(recAmount, 2, true)+'</span>'
+                    });
+                    message = '税额(本位币)(元):'+saas.util.BaseUtil.numberFormat(tax, 2, true)+message
+                    me.renderSummaryData =message;
+                }else{
+                    message = '税额(本位币)(元):0'
+                    me.renderSummaryData =message;
+                }
+            } catch (e) {
+                console.error(e);
+                saas.util.BaseUtil.showErrorToast(e.message);
+            }
+        }
+    }
 
 });