发票撤回收款功能

src/main/java/com/jeeplus/modules/workinvoice/dao/WorkInvoiceDao.java

@@ -66,6 +66,12 @@ public interface WorkInvoiceDao extends CrudDao<WorkInvoice> {
 	void receiptMoney(WorkInvoice workInvoice);
 
 	/**
+	 * 撤回财务确认收款操作
+	 * @param workInvoice
+	 */
+	void cancelReceiptMoney(WorkInvoice workInvoice);
+
+	/**
 	 * 根据开票id查询所有开票项目 关联信息
 	 * @param invoiceId
 	 * @return

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -701,6 +701,19 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 			workInvoiceDetailDao.delete(workAccount);
 		}*/
 	}
+
+	/**
+	 * 撤回财务确认收款操作
+	 * @param workInvoice
+	 */
+	@Transactional(readOnly = false)
+	public void saveCancelReceiptMoney(WorkInvoice workInvoice) {
+		workInvoice.preUpdate();
+		dao.cancelReceiptMoney(workInvoice);
+		/*for (WorkInvoiceDetail workAccount : workInvoice.getWorkAccountList()){
+			workInvoiceDetailDao.delete(workAccount);
+		}*/
+	}
 	/**
 	 * 获取关联项目名称list
 	 * @param workInvoice

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -388,6 +388,19 @@ public class WorkInvoiceAllController extends BaseController {
 	}
 
 	/**
+	 * 撤回确认收款
+	 * @param workInvoice
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequestMapping(value = "saveCancelReceiptMoney")
+	public String saveCancelReceiptMoney(WorkInvoice workInvoice, RedirectAttributes redirectAttributes) {
+		workInvoiceService.saveCancelReceiptMoney(workInvoice);
+		addMessage(redirectAttributes, "撤回确认收款信息成功");
+		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
+	}
+
+	/**
 	 * 保存开票管理
 	 */
 	@RequestMapping(value = "save")

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -1692,6 +1692,15 @@
 		WHERE id = #{id}
 	</update>
 
+	<update id="cancelReceiptMoney">
+		UPDATE work_invoice SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			receipt_money_date= now(),
+			receipt_money = 0
+		WHERE id = #{id}
+	</update>
+
 
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="WorkInvoice" statementType="STATEMENT">

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -721,6 +721,10 @@
 							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 收款</a>";
 							xml+="<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/saveAffirmReceipt?id=" + d.id + "\" onclick=\"return confirmx('是否确认收款？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 确认收款</a>";
 						}
+						if(d.moneyReceiptFlag != undefined && d.moneyReceiptFlag =="1")
+						{
+							xml+="<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/saveCancelReceiptMoney?id=" + d.id + "\" onclick=\"return confirmx('是否撤回确认收款？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 撤回收款</a>";
+						}
 						if(d.cancellationFlag != undefined && d.cancellationFlag =="1")
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废</a>";
@@ -803,6 +807,11 @@
 								<c:when test="${workInvoice.invoiceState == 5 && workInvoice.receiptMoney == '否'}">"1"</c:when>
 								<c:otherwise>"0"</c:otherwise>
 						</c:choose>
+						,"moneyReceiptFlag":
+							<c:choose>
+								<c:when test="${workInvoice.invoiceState == 5 && workInvoice.receiptMoney == '是'}">"1"</c:when>
+								<c:otherwise>"0"</c:otherwise>
+						</c:choose>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="workinvoice:workInvoice:invalid">
 						,"cancellationFlag":