修改财务

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/ApplyDTO.java

@@ -42,4 +42,6 @@ public class ApplyDTO extends Acc {
 	private String billType;
 
 	private String url;
+
+	private String itemType;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Settlement.java

@@ -229,5 +229,6 @@ public class Settlement  implements Serializable {
 
 	private BigDecimal foreignAmount;
 
+	private String itemType;
 
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ImportReCeVingController.java

@@ -130,7 +130,7 @@ public class ImportReCeVingController extends BladeController {
 				}
 				R<User> user = iUserClient.userInfoById(e.getCreateUser());
 				if (user.isSuccess() && user.getData() != null){
-					e.setCreateUserName(user.getData().getName());
+					e.setCreateUserName(user.getData().getRealName());
 				}
 
 			});

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -330,7 +330,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		Acc acc = accMapper.selectById(accId);
 		if(acc==null)
 		{
-		   throw new SecurityException("扣款账单失败");
+		   throw new SecurityException("操作账单失败");
 		}
 		//结算成功后,更新acc表金额,采购收费 销售付费
 		acc.setSettlementAmount(acc.getSettlementAmount()!=null?acc.getSettlementAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
@@ -356,12 +356,28 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			//如果是人民币,修改人民结算字段
 			if(items.getCurrency().equals("CNY"))
 			{
-				client.setSettlmentAmount(client.getSettlmentAmount()!=null?client.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+				if(settlementDTO.getBillType().equals("申请")||settlementDTO.getBillType().equals("付费"))
+				{
+					client.setSettlmentAmount(client.getSettlmentAmount()!=null?client.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+				}
+				else if(settlementDTO.getBillType().equals("收费"))
+				{
+					client.setSettlmentAmount(client.getSettlmentAmount()!=null?items.getThisAmount().subtract(client.getSettlmentAmount()):items.getThisAmount().subtract(new BigDecimal("0")));
+				}
+
 			}
 			//如果是外币
 			else
 			{
-				client.setForeignSettlmentAmount(client.getForeignSettlmentAmount()!=null?client.getForeignSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+				if(settlementDTO.getBillType().equals("申请")||settlementDTO.getBillType().equals("收费"))
+				{
+					client.setForeignSettlmentAmount(client.getForeignSettlmentAmount()!=null?client.getForeignSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+				}
+				else if(settlementDTO.getBillType().equals("付费"))
+				{
+					client.setForeignSettlmentAmount(client.getForeignSettlmentAmount()!=null?items.getThisAmount().subtract(client.getForeignSettlmentAmount()):items.getThisAmount().subtract(new BigDecimal("0")));
+				}
+				//client.setForeignSettlmentAmount(client.getForeignSettlmentAmount()!=null?client.getForeignSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
 			}
 			orderDescClient.updateOrder(client);
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -390,7 +390,15 @@ public class PurchaseOrderController extends BladeController {
 			iPage.getRecords().forEach(e->{
 				//商品信息
 				R<GoodsDescVO> goodsDescVOR = goodsDescClient.selectGoodsMessage(e.getItemId());
-				e.setPriceCategoryNames(goodsDescVOR.getData().getCname());
+				if(goodsDescVOR.isSuccess())
+				{
+					GoodsDescVO descVO = goodsDescVOR.getData();
+					if(descVO!=null)
+					{
+						e.setPriceCategoryNames(descVO.getCname());
+					}
+
+				}
 				//供应商信息
 				if (e.getCorpId() != null){