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

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

@@ -26,9 +26,10 @@
 		  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
+		  sum(ifnull(pd_price,0)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as costamount,
+	  	  sum((pd_netprice*pi_rate-pd_price)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as profit,
+		  (sum((pd_netprice*pi_rate-pd_price)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))))
+		  	/sum(pd_netprice*pi_rate*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))*100 as profitpresent
 	  from prodiodetail
 	  left join prodinout on pd_piid=pi_Id
 	  left join customer on cu_id = pi_custid
@@ -54,9 +55,9 @@
 				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
+				sum(pd_price*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))) as costamount,
+				sum((pd_netprice*pi_rate-pd_price)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0)))  as profit,
+				(sum((pd_netprice*pi_rate-pd_price)*(ifnull(pd_outqty,0)-ifnull(pd_inqty,0))))/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

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

@@ -817,7 +817,7 @@ public class SaleServiceImpl implements SaleService{
     private IPage<RemindRspDTO> getRemindRspDTO(Long enUU, Long userUU, RemindReqDTO remindReqDTO){
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("userUU", userUU);
-        jsonObject.put("enUU", enUU);
+        jsonObject.put("vendUU", enUU);
         jsonObject.put("fromDate", remindReqDTO.getFromDate());
         jsonObject.put("endDate", remindReqDTO.getEndDate());
         jsonObject.put("fromDelivery", null);

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInOutServiceImpl.java

@@ -215,6 +215,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRED)
     public DocBaseDTO audit(ProdInOutFormDTO formData) {
         Long id = null;
         DocBaseDTO baseDTO = new DocBaseDTO();
@@ -244,7 +245,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         return baseDTO;
     }
 
-    @Transactional(propagation = Propagation.REQUIRED)
     public void singleAudit(ProdInOutDTO prodInOutDTO) {
         String pi_class= prodInOutDTO.getPi_class();
         String pi_inoutno = prodInOutDTO.getPi_inoutno();

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

@@ -200,7 +200,7 @@ public class InquiryApiTest {
     public void testI_findQuotationList(){
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("userUU", null);
-        jsonObject.put("enUU", "10050690");
+        jsonObject.put("vendUU", "10050689");
         jsonObject.put("fromDate", null);
         jsonObject.put("endDate", null);
         jsonObject.put("fromDelivery", null);