修改商品信息和优化销项

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

@@ -58,7 +58,7 @@ public class InvoiceItem implements Serializable {
 	* 单位
 	*/
 		@ApiModelProperty(value = "单位")
-		private BigDecimal unit;
+		private String unit;
 	/**
 	* 数量
 	*/

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

@@ -257,4 +257,12 @@ public class Settlement  implements Serializable {
 
 	@TableField(exist = false)
 	private List<InvoiceItem> invoiceItemList;
+
+	private String invoiceTitle;//发票抬头
+	private Date invoiceTime;//开票日期
+	private String InvoiceNo;//发票号
+	private String taxpayerIdentificationNo;//纳税人识别号
+	private String bankNo;//开户银行号
+	private String addressPhone;//地址电话
+
 }

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -337,5 +337,21 @@ public class AuditProecessController extends BladeController {
 		return R.status(auditProecessService.removeByIds(Func.toLongList(ids)));
 	}*/
 
+	/**
+	 * 同海-待审批数据统计: 第一级审批未开始,整个审批数据就算待审
+	 * */
+	@GetMapping("countTongHaiNoApproval")
+	public R countTongHaiNoApproval()
+	{
+		LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		auditProecessLambdaQueryWrapper
+			.eq(AuditProecess::getAuditStatus,"S")
+			.eq(AuditProecess::getLevelId,1)
+			.eq(AuditProecess::getTenantId,AuthUtil.getTenantId())
+			.eq(AuditProecess::getIsDelete,0);
+		int count = auditProecessService.count(auditProecessLambdaQueryWrapper);
+		return R.data(count);
+	}
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -479,7 +479,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 
 				if(one==null)
 				{
-					goodsDesc.setIntegralMultiples(new BigDecimal(e.getIntegralMultiples()));
+					goodsDesc.setIntegralMultiples(new BigDecimal(StringUtils.isBlank(e.getIntegralMultiples())?"0":e.getIntegralMultiples()));
 					goodsDesc.setCreateTime(new Date());
 					goodsDesc.setCreateUser(AuthUtil.getUserId());
 					goodsDesc.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -495,7 +495,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 				}
 				else
 				{
-					goodsDesc.setIntegralMultiples(new BigDecimal(e.getIntegralMultiples()));
+					goodsDesc.setIntegralMultiples(new BigDecimal(StringUtils.isBlank(e.getIntegralMultiples())?"0":e.getIntegralMultiples()));
 					goodsDesc.setId(one.getId());
 					goodsDesc.setUpdateTime(new Date());
 					goodsDesc.setUpdateUser(AuthUtil.getUserId());

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsTypeServiceImpl.java

@@ -150,6 +150,7 @@ public class GoodsTypeServiceImpl extends ServiceImpl<GoodsTypeMapper, GoodsType
 			.eq(GoodsType::getType, goodsType.getType())
 			.eq(GoodsType::getCname, goodsType.getCname())
 			.eq(GoodsType::getTenantId, goodsType.getTenantId())
+			.eq(GoodsType::getIsDeleted,0)
 		);
 		if (count > 0) {
 			throw new ServiceException("类型名称已存在");

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -21,6 +21,9 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.springblade.finance.dto.ApplyDTO;
 import org.springblade.finance.dto.SettlementDTO;
+import org.springblade.finance.entity.InvoiceItem;
+import org.springblade.finance.mapper.InvoiceItemMapper;
+import org.springblade.finance.service.IInvoiceItemService;
 import org.springblade.finance.vojo.Acc;
 import org.springblade.finance.vojo.Items;
 import org.springblade.finance.vojo.Settlement;
@@ -76,6 +79,8 @@ public class SettlementController extends BladeController {
 	private final IFeesDescClient iFeesDescClient;
 
 	private final IAccService accService;
+
+	private final IInvoiceItemService iInvoiceItemService;
 	/**
 	 * 详情
 	 */
@@ -86,9 +91,13 @@ public class SettlementController extends BladeController {
 	/*	JdyTool.test();*/
 		Settlement detail = settlementService.getById(settlement.getId());
 		LambdaQueryWrapper<Items> itemsLambdaQueryWrapper=new LambdaQueryWrapper<>();
-		itemsLambdaQueryWrapper.eq(Items::getPid,detail.getId());
+		itemsLambdaQueryWrapper.eq(Items::getPid,detail.getId()).eq(Items::getIsDeleted,0);
 		List<Items> list = itemsService.list(itemsLambdaQueryWrapper);
 
+		LambdaQueryWrapper<InvoiceItem> itemLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		itemLambdaQueryWrapper.eq(InvoiceItem::getPid,detail.getId()).eq(InvoiceItem::getIsDeleted,0);
+		List<InvoiceItem> invoiceItemList = iInvoiceItemService.list(itemLambdaQueryWrapper);
+		detail.setInvoiceItemList(invoiceItemList);
 		if(CollectionUtils.isNotEmpty(list))
 		{
 			list.forEach(e->{
@@ -340,10 +349,9 @@ public class SettlementController extends BladeController {
 	 *  发起-进项和销项的请求结算接口
  	 */
 	@PostMapping("putFund")
-	public R putFund(@RequestBody Settlement settlement)
-	{
+	public R putFund(@RequestBody Settlement settlement) throws Exception {
 		settlementService.putFund(settlement);
-		return R.success("操作成功");
+		return this.detail(settlement);
 	}
 
 	/**
@@ -351,10 +359,9 @@ public class SettlementController extends BladeController {
 	 *  撤回-进项和销项的请求结算接口
 	 */
 	@PostMapping("cancelFund")
-	public R cancelFund(@RequestBody Settlement settlement)
-	{
+	public R cancelFund(@RequestBody Settlement settlement) throws Exception {
 		settlementService.cancelFund(settlement);
-		return R.success("操作成功");
+		return this.detail(settlement);
 	}
 
 	@PostMapping("createInvoiceItem")

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

@@ -849,6 +849,34 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@Transactional
 	public SettlementDTO saveOrEdit(SettlementDTO settlementDTO) {
 
+		//绑定开票信息
+		List<InvoiceItem> invoiceItemList = settlementDTO.getInvoiceItemList();
+		if(CollectionUtils.isNotEmpty(invoiceItemList))
+		{
+			invoiceItemList.forEach(e->{
+				 //新增
+				if(e.getId()==null)
+				 {
+				 	e.setPid(settlementDTO.getId());
+				 	e.setCreateTime(new Date());
+				 	e.setTenantId(AuthUtil.getTenantId());
+				 	e.setCreateUser(AuthUtil.getUserId());
+				 	invoiceItemMapper.insert(e);
+				 }
+				//修改
+				else
+				{
+					e.setUpdateTime(new Date());
+					e.setUpdateUser(AuthUtil.getUserId());
+					invoiceItemMapper.updateById(e);
+				}
+			});
+
+
+
+		}
+
+
 		Settlement model = new Settlement();
 		BeanUtils.copyProperties(settlementDTO, model);
 		List<Files> filesList = settlementDTO.getFilesList();
@@ -1008,7 +1036,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			.eq(InvoiceItem::getTenantId,AuthUtil.getTenantId());
 
 		int count=	invoiceItemMapper.selectCount(invoiceItemLambdaQueryWrapper);
-		if(count>0)
+		if(count==0)
 		{
 			throw new SecurityException("未查到开票信息,禁止操作");
 		}
@@ -1020,7 +1048,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		{
 			throw new SecurityException("未查询到款项信息");
 		}
-		if(select.getFoundStatus().equals("核销完成"))
+		if(select.getFoundStatus()!=null && select.getFoundStatus().equals("核销完成"))
 		{
 			throw new SecurityException("已经核销,禁止操作");
 		}
@@ -1067,7 +1095,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			.eq(InvoiceItem::getTenantId,AuthUtil.getTenantId());
 
 		int count=	invoiceItemMapper.selectCount(invoiceItemLambdaQueryWrapper);
-		if(count>0)
+		if(count==0)
 		{
 			throw new SecurityException("未查到开票信息,禁止操作");
 		}
@@ -1078,7 +1106,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		{
 			throw new SecurityException("未查询到款项信息");
 		}
-		if(select.getFoundStatus().equals("未核销"))
+		if(select.getFoundStatus()!=null && select.getFoundStatus().equals("未核销"))
 		{
 			throw new SecurityException("已经撤销过 或者 还未核销,禁止操作");
 		}