|
@@ -267,32 +267,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
"LEFT JOIN UFDATA_903_2021.dbo.Department de ON ss.cDepCode = de.cDepCode " +
|
|
|
"LEFT JOIN UFDATA_903_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode " +
|
|
|
"WHERE c.cInvCcode like '19%' GROUP BY v.cVenName ";
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
List<Map<String, Object>> list = senYuDataSourceOne.queryForList(sqlQueryhard);
|
|
|
if(list.size()==0){
|
|
|
return null;
|
|
@@ -785,14 +760,14 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
syCostAllocation.setUsdTotalexportprice(BigDecimal.ZERO);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ if(ship.getProcessCost()!=null){
|
|
|
+ if(syCostAllocation.getRmbProcesscost()==null){
|
|
|
+ syCostAllocation.setRmbProcesscost(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
+ syCostAllocation.setRmbProcesscost(ship.getProcessCost().add(syCostAllocation.getRmbProcesscost()));
|
|
|
+ }else {
|
|
|
+ ship.setProcessCost(BigDecimal.ZERO);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if(syCostAllocation.getActualShipquantity()!=null && syCostAllocation.getPlanQuantity()!=null){
|