完善代码

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java

@@ -130,6 +130,13 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
 	@Select("select * from sys_dict where del_flag = 1")
 	public List<SysDict> queryDeleteList();
 
+	/**
+	 * 根据名称获取 协议条款
+	 * @return
+	 */
+	@Select("select content from base_agreement_terms where name =#{name} LIMIT 1")
+	public String queryAgreementTermsByName(@Param("name") String name);
+
 	/**
 	 * 修改状态值
 	 * @param delFlag

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java

@@ -22,6 +22,12 @@ import java.util.Map;
  */
 public interface ISysDictService extends IService<SysDict> {
 
+	/**
+	 * 根据名称获取 协议条款
+	 * @param name
+	 * @return
+	 */
+	public String queryAgreementTermsByName(String name);
 	/**
 	 *  校验数据是否可用，不存在重复数据
 	 *  

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CommonConstant;
@@ -73,6 +74,10 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	@Autowired
 	private RedisUtil redisUtil;
 
+	@Override
+	public String queryAgreementTermsByName(String name){
+		return sysDictMapper.queryAgreementTermsByName(name);
+	}
 	@Override
 	public boolean duplicateCheckData(DuplicateCheckVo duplicateCheckVo) {
 		Long count = null;

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurOrderController.java

@@ -138,6 +138,20 @@ public class PurOrderController {
         return Result.OK(pageList);
     }
 
+    @ApiOperation(value = "采购订单-分页列表查询(采购付款申请使用)", notes = "采购订单-分页列表查询(采购付款申请使用)")
+    @GetMapping(value = "/listAlert")
+    @PermissionData(pageComponent = "purchase/purchaseOrder/PurchaseOrderFormList")
+    public Result<IPage<PurOrder>> listAlert(PurOrder purOrder,
+                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                             HttpServletRequest req) {
+        QueryWrapper<PurOrder> queryWrapper = QueryGenerator.initQueryWrapper(purOrder, req.getParameterMap());
+        Page<PurOrder> page = new Page<PurOrder>(pageNo, pageSize);
+        queryWrapper.apply("total_amount > IFNULL(total_amount_used, 0)");
+        IPage<PurOrder> pageList = purOrderService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 采购订单弹框明细
      *
@@ -452,7 +466,7 @@ public class PurOrderController {
                 continue;
             }
             QueryWrapper<PurPaymentRequest> queryPurPaymentRequest = new QueryWrapper();
-            queryPurPaymentRequest.eq("source_code", code);
+            queryPurPaymentRequest.like("source_code", code);
             queryPurPaymentRequest.eq("del_flag", "0");
 
             List<PurPaymentRequest> listPurPaymentRequest = purPaymentRequestService.list(queryPurPaymentRequest);

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrder.java

@@ -212,6 +212,13 @@ public class PurOrder implements Serializable {
 	@Excel(name = "来源2", width = 15)
     @ApiModelProperty(value = "来源2")
     private String sourceCode2;
+
+	//订单总金额
+    private BigDecimal totalAmount;
+    //订单总金额(已被付款申请参照金额)
+    private BigDecimal totalAmountUsed;
+
+
     //导出字段使用
     @TableField(exist = false)
     private String purchasePhone;

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrderHis.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.purCode.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -212,4 +213,10 @@ public class PurOrderHis implements Serializable {
     private String sourceCode2;
     private String purchaseDepartmentName;
     private String purchasemanName;
+
+    //订单总金额
+    private BigDecimal totalAmount;
+    //订单总金额(已被付款申请参照金额)
+    private BigDecimal totalAmountUsed;
+
 }

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Collection;
 
@@ -34,6 +35,17 @@ public class PurOrderServiceImpl extends ServiceImpl<PurOrderMapper, PurOrder> i
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(PurOrder purOrder, List<PurOrderShip> purOrderShipList,List<PurOrderProduct> purOrderProductList) {
+
+		BigDecimal totalAmount = BigDecimal.ZERO;
+		if(purOrderProductList!=null && purOrderProductList.size()>0) {
+			for(PurOrderProduct entity:purOrderProductList) {
+				BigDecimal amount = entity.getTaxAmount()==null ? BigDecimal.ZERO : entity.getTaxAmount();
+				totalAmount = totalAmount.add(amount);
+			}
+		}
+		purOrder.setTotalAmount(totalAmount);
+		purOrder.setTotalAmountUsed(BigDecimal.ZERO);
+
 		purOrderMapper.insert(purOrder);
 		if(purOrderShipList!=null && purOrderShipList.size()>0) {
 			for(PurOrderShip entity:purOrderShipList) {
@@ -56,6 +68,16 @@ public class PurOrderServiceImpl extends ServiceImpl<PurOrderMapper, PurOrder> i
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateMain(PurOrder purOrder,List<PurOrderShip> purOrderShipList,List<PurOrderProduct> purOrderProductList) {
+
+		BigDecimal totalAmount = BigDecimal.ZERO;
+		if(purOrderProductList!=null && purOrderProductList.size()>0) {
+			for(PurOrderProduct entity:purOrderProductList) {
+				BigDecimal amount = entity.getTaxAmount()==null ? BigDecimal.ZERO : entity.getTaxAmount();
+				totalAmount = totalAmount.add(amount);
+			}
+		}
+		purOrder.setTotalAmount(totalAmount);
+
 		purOrderMapper.updateById(purOrder);
 		
 		//1.先删除子表数据

srm-module-code/src/main/java/org/jeecg/modules/purCode/service/impl/PurPaymentRequestServiceImpl.java

@@ -1,7 +1,10 @@
 package org.jeecg.modules.purCode.service.impl;
 
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.purCode.entity.PurOrder;
 import org.jeecg.modules.purCode.entity.PurPaymentRequest;
 import org.jeecg.modules.purCode.entity.PurPaymentRequestDetails;
+import org.jeecg.modules.purCode.mapper.PurOrderMapper;
 import org.jeecg.modules.purCode.mapper.PurPaymentRequestDetailsMapper;
 import org.jeecg.modules.purCode.mapper.PurPaymentRequestMapper;
 import org.jeecg.modules.purCode.service.IPurPaymentRequestService;
@@ -27,7 +30,9 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 	private PurPaymentRequestMapper purPaymentRequestMapper;
 	@Autowired
 	private PurPaymentRequestDetailsMapper purPaymentRequestDetailsMapper;
-	
+	@Autowired
+	private PurOrderMapper purOrderMapper;
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveMain(PurPaymentRequest purPaymentRequest, List<PurPaymentRequestDetails> purPaymentRequestDetailsList) {
@@ -51,12 +56,71 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 				purPaymentRequestDetailsMapper.insert(entity);
 			}
 		}
+
+		if(purPaymentRequestDetailsList!=null && purPaymentRequestDetailsList.size()>0) {
+
+			for(PurPaymentRequestDetails entity:purPaymentRequestDetailsList) {
+				String sourceId = entity.getPurchaseId();
+				if(StringUtils.isBlank(sourceId)){
+					throw new RuntimeException("缺失来源参数请联系管理员sourceId!!");
+				}
+				BigDecimal applyMoney = entity.getApplyMoney() == null ? BigDecimal.ZERO : entity.getApplyMoney();//本次申请金额
+
+				PurOrder order = purOrderMapper.selectById(sourceId);
+				if (order != null) {
+					BigDecimal totalAmount = order.getTotalAmount() == null ? BigDecimal.ZERO : order.getTotalAmount();//订单金额
+					BigDecimal totalAmountUsed = order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed();//已使用金额
+
+					totalAmountUsed = applyMoney.add(totalAmountUsed);
+
+					if(totalAmount.compareTo(totalAmountUsed) < 1){
+						throw new RuntimeException(order.getBillCode()+"金额不足(剩余:"+totalAmount.subtract(order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed())+"),请重新填写申请金额!");
+					}
+
+					order.setTotalAmountUsed(totalAmountUsed);
+					purOrderMapper.updateById(order);
+				}else{
+					throw new RuntimeException("采购订单不存在,请刷新后重试:"+entity.getPurchaseCode());
+				}
+			}
+		}
+
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void updateMain(PurPaymentRequest purPaymentRequest,List<PurPaymentRequestDetails> purPaymentRequestDetailsList) {
 
+		List<PurPaymentRequestDetails> detailsList = purPaymentRequestDetailsMapper.selectByMainId(purPaymentRequest.getId());
+		if (detailsList != null && detailsList.size() > 0) {
+
+			for(PurPaymentRequestDetails entity:detailsList) {
+				String sourceId = entity.getPurchaseId();
+				if (StringUtils.isNotBlank(sourceId)) {
+
+					BigDecimal applyMoney = entity.getApplyMoney() == null ? BigDecimal.ZERO : entity.getApplyMoney();//本次申请金额
+					PurOrder order = purOrderMapper.selectById(sourceId);
+					if (order != null) {
+
+						BigDecimal totalAmountUsed = order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed();//已使用金额
+
+						totalAmountUsed = totalAmountUsed.subtract(applyMoney);
+
+						if (applyMoney.compareTo(BigDecimal.ZERO) < 1) {
+							order.setTotalAmountUsed(BigDecimal.ZERO);
+						} else {
+
+							order.setTotalAmountUsed(totalAmountUsed);
+						}
+						purOrderMapper.updateById(order);
+
+					}
+
+				}
+
+			}
+		}
+
 		BigDecimal approveMoney = BigDecimal.ZERO;
 		if(purPaymentRequestDetailsList!=null && purPaymentRequestDetailsList.size()>0) {
 			for(PurPaymentRequestDetails entity:purPaymentRequestDetailsList) {
@@ -68,7 +132,6 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 
 		purPaymentRequest.setApproveMoney(approveMoney);
 
-
 		purPaymentRequestMapper.updateById(purPaymentRequest);
 		
 		//1.先删除子表数据
@@ -82,11 +145,72 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 				purPaymentRequestDetailsMapper.insert(entity);
 			}
 		}
+
+
+		if(purPaymentRequestDetailsList!=null && purPaymentRequestDetailsList.size()>0) {
+
+			for(PurPaymentRequestDetails entity:purPaymentRequestDetailsList) {
+				String sourceId = entity.getPurchaseId();
+				if(StringUtils.isBlank(sourceId)){
+					throw new RuntimeException("缺失来源参数请联系管理员sourceId!!");
+				}
+				BigDecimal applyMoney = entity.getApplyMoney() == null ? BigDecimal.ZERO : entity.getApplyMoney();//本次申请金额
+
+				PurOrder order = purOrderMapper.selectById(sourceId);
+				if (order != null) {
+					BigDecimal totalAmount = order.getTotalAmount() == null ? BigDecimal.ZERO : order.getTotalAmount();//订单金额
+					BigDecimal totalAmountUsed = order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed();//已使用金额
+
+					totalAmountUsed = applyMoney.add(totalAmountUsed);
+
+					if(totalAmount.compareTo(totalAmountUsed) < 1){
+						throw new RuntimeException(order.getBillCode()+"金额不足(剩余:"+totalAmount.subtract(order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed())+"),请重新填写申请金额!");
+					}
+
+					order.setTotalAmountUsed(totalAmountUsed);
+					purOrderMapper.updateById(order);
+				}else{
+					throw new RuntimeException("采购订单不存在,请刷新后重试:"+entity.getPurchaseCode());
+				}
+			}
+		}
+
 	}
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void delMain(String id) {
+
+		List<PurPaymentRequestDetails> detailsList = purPaymentRequestDetailsMapper.selectByMainId(id);
+		if (detailsList != null && detailsList.size() > 0) {
+
+			for(PurPaymentRequestDetails entity:detailsList) {
+				String sourceId = entity.getPurchaseId();
+				if (StringUtils.isNotBlank(sourceId)) {
+
+					BigDecimal applyMoney = entity.getApplyMoney() == null ? BigDecimal.ZERO : entity.getApplyMoney();//本次申请金额
+					PurOrder order = purOrderMapper.selectById(sourceId);
+					if (order != null) {
+
+						BigDecimal totalAmountUsed = order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed();//已使用金额
+
+						totalAmountUsed = totalAmountUsed.subtract(applyMoney);
+
+						if (applyMoney.compareTo(BigDecimal.ZERO) < 1) {
+							order.setTotalAmountUsed(BigDecimal.ZERO);
+						} else {
+
+							order.setTotalAmountUsed(totalAmountUsed);
+						}
+						purOrderMapper.updateById(order);
+
+					}
+
+				}
+
+			}
+		}
+
 		purPaymentRequestDetailsMapper.deleteByMainId(id);
 		purPaymentRequestMapper.deleteById(id);
 	}
@@ -95,6 +219,37 @@ public class PurPaymentRequestServiceImpl extends ServiceImpl<PurPaymentRequestM
 	@Transactional(rollbackFor = Exception.class)
 	public void delBatchMain(Collection<? extends Serializable> idList) {
 		for(Serializable id:idList) {
+
+			List<PurPaymentRequestDetails> detailsList = purPaymentRequestDetailsMapper.selectByMainId(id.toString());
+			if (detailsList != null && detailsList.size() > 0) {
+
+				for(PurPaymentRequestDetails entity:detailsList) {
+					String sourceId = entity.getPurchaseId();
+					if (StringUtils.isNotBlank(sourceId)) {
+
+						BigDecimal applyMoney = entity.getApplyMoney() == null ? BigDecimal.ZERO : entity.getApplyMoney();//本次申请金额
+						PurOrder order = purOrderMapper.selectById(sourceId);
+						if (order != null) {
+
+							BigDecimal totalAmountUsed = order.getTotalAmountUsed() == null ? BigDecimal.ZERO : order.getTotalAmountUsed();//已使用金额
+
+							totalAmountUsed = totalAmountUsed.subtract(applyMoney);
+
+							if (applyMoney.compareTo(BigDecimal.ZERO) < 1) {
+								order.setTotalAmountUsed(BigDecimal.ZERO);
+							} else {
+
+								order.setTotalAmountUsed(totalAmountUsed);
+							}
+							purOrderMapper.updateById(order);
+
+						}
+
+					}
+
+				}
+			}
+
 			purPaymentRequestDetailsMapper.deleteByMainId(id.toString());
 			purPaymentRequestMapper.deleteById(id);
 		}

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderAlert.java

@@ -13,6 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -37,8 +38,13 @@ public class PurOrderAlert implements Serializable {
     private String organize;
     //协议条款
     private String agreementTerms;
+    //订单总金额
+    private BigDecimal totalAmount;
+    //订单总金额(已被付款申请参照金额)
+    private BigDecimal totalAmountUsed;
 
-	/**创建时间*/
+
+    /**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderHisPage.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.purCode.vo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import org.jeecg.modules.purCode.entity.PurOrderHis;
 import org.jeecg.modules.purCode.entity.PurOrderShipHis;
@@ -27,6 +28,11 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="pur_order_hisPage对象", description="采购订单（历史）")
 public class PurOrderHisPage {
 
+	//订单总金额
+	private BigDecimal totalAmount;
+	//订单总金额(已被付款申请参照金额)
+	private BigDecimal totalAmountUsed;
+
 	private String purchaseDepartmentName;
 	private String purchasemanName;
 	/**历史主键*/

srm-module-code/src/main/java/org/jeecg/modules/purCode/vo/PurOrderPage.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.purCode.vo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import org.jeecg.modules.purCode.entity.PurOrder;
 import org.jeecg.modules.purCode.entity.PurOrderShip;
@@ -27,6 +28,11 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value="pur_orderPage对象", description="采购订单")
 public class PurOrderPage {
 
+	//订单总金额
+	private BigDecimal totalAmount;
+	//订单总金额(已被付款申请参照金额)
+	private BigDecimal totalAmountUsed;
+
 	private String purchaseDepartmentName;
 	private String purchasemanName;
 	/**主键id*/