收付款修改，出入库导出增加金额

adm/src/main/java/com/minpay/guomao/contractmanage/action/FinanceToExecl.java

@@ -521,6 +521,7 @@ public class FinanceToExecl implements IMINAction{
 			@MINParam(key = "dates") String dates,
 			@MINParam(key = "orderId") String orderId,
 			@MINParam(key = "termsPayment") String termsPayment,
+			@MINParam(key = "remarks") String remarks,
 			@MINParam(key = "page",defaultValue = "1") int page,
 			@MINParam(key = "limit", defaultValue = "10") int limit,
 			MINSession session,
@@ -540,6 +541,7 @@ public class FinanceToExecl implements IMINAction{
 		maps.put("shoukuan", shoukuan);
 		maps.put("fukuan",fukuan);
 		maps.put("termsPayment",termsPayment);
+		maps.put("remarks",remarks);
 		MINRowBounds rows = new MINRowBounds(1,Constant.EXCEL_MAX_NUM);
 		rows.setSeparateSql(true);
 		// 执行查询

adm/src/main/java/com/minpay/guomao/paymentmanage/action/PaymentManageAction.java

@@ -111,6 +111,7 @@ public class PaymentManageAction implements IMINAction {
 			@MINParam(key = "orderId") String orderId,
 			@MINParam(key = "dates") String dates,
 			@MINParam(key = "termsPayment") String termsPayment,
+			@MINParam(key = "remarks") String remarks,
 			MINSession session) throws MINBusinessException {
 
 			MINActionResult res = new MINActionResult();
@@ -125,6 +126,7 @@ public class PaymentManageAction implements IMINAction {
 			map.put("shoukuan", shoukuan);
 			map.put("fukuan",fukuan);
 			map.put("termsPayment",termsPayment);//付款期限
+			map.put("remarks",remarks);//备注
 			// 获取操作员
 			User u = session.getUser();
 			// 获取角色
@@ -302,6 +304,7 @@ public class PaymentManageAction implements IMINAction {
 			@MINParam(key ="contractNo") String contractNo,
 			@MINParam(key ="weight") String weight,
 			@MINParam(key ="termsPayment") String termsPayment,
+			@MINParam(key ="remarks") String remarks,
 			HttpServletRequest request
 	) throws MINBusinessException {
 	
@@ -333,6 +336,7 @@ public class PaymentManageAction implements IMINAction {
 		ai.setYuPrice(totalMoney);
 		ai.setContractId(contractNo);		// 合同编号
 		ai.setBranchId(u.getBranchId());		// 机构id
+		ai.setRemarks(remarks); 			//备注
 		if(!CommonUtil.isEmpty(termsPayment)){
 			termsPayment = termsPayment.replaceAll("-","");
 			ai.setTermsPayment(termsPayment);//付款期限
@@ -690,6 +694,7 @@ public class PaymentManageAction implements IMINAction {
 			@MINParam(key = "totalMoney") String totalMoney,
 			@MINParam(key = "totalMoneys") String totalMoneys,
 			@MINParam(key = "termsPayment") String termsPayment,
+			@MINParam(key = "aopRemarks") String aopRemarks,
 			MINSession session
 			) throws MINBusinessException {
 		
@@ -708,6 +713,7 @@ public class PaymentManageAction implements IMINAction {
 		p.setPayPrice(totalMoneys);			//实际价格
 		p.setYuPrice(totalMoney);			//预估价格
 		p.setTermsPayment(termsPayment);	//付款期限
+		p.setRemarks(aopRemarks); 			//备注
 		p.setModifyTime(currentTime);		//修改时间
 		p.setModifyUser(u.getId());			//修改人
 		Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApOrderPaymentMapper.class)

adm/src/main/resources/com/minpay/db/table/own/mapper/PaymentManageMapper.xml

@@ -146,7 +146,9 @@
 		IFNULL(t.ACA_BANK_NAME,'未维护')				"bankName",
 		a.AOP_PRICE_TYPE			"priceType"	,
 		p.ADP_ID			"adpId",
-		IFNULL(a.AOP_TERMS_PAYMENT,'')	"termsPayment"
+		IFNULL(a.AOP_TERMS_PAYMENT,'')	"termsPayment",
+		a.AOP_ALL_WEIGHT			'aopAllWeight',
+		a.AOP_REMARKS				'aopRemarks'
 		FROM ap_order_payment a
 			LEFT JOIN ap_contract_inf e
 				ON a.AOP_CONTRACT_ID = e.ACI_ID
@@ -171,6 +173,9 @@
 		 <if test="shoukuan != null and shoukuan != ''">
 			and f.ACI_SHORT_NAME  like concat('%',#{shoukuan,jdbcType=VARCHAR},'%')
 		</if>
+		 <if test="remarks != null and remarks != ''">
+			and a.AOP_REMARKS  like concat('%',#{remarks,jdbcType=VARCHAR},'%')
+		</if>
 		<if test="contractId != null and contractId != ''">
 			and b.AOI_CONTRACT_ID = #{contractId,jdbcType=VARCHAR}
 		</if>

adm/src/main/webapp/admin/paymentManage/addPayment.html

@@ -97,6 +97,16 @@
 				</div>
 			</div>
 		</div>
+		<div class="f-content display">
+			<div class="f-c-part">
+				<div class="">
+					<div class="f12-black5">备注：</div>
+					<div class="" style="display: flex;align-items: center;">
+						<textarea name="remarks" id ="remarks"  autocomplete="off" placeholder="请输入备注"  class="layui-textarea" ></textarea>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 	<div class="shadow-content" style="margin-bottom: 50px;">
 		<table id="tableTest" lay-filter="tableFilter"></table>
@@ -300,7 +310,7 @@
 				var typeCost = $("select[name='typeCost']").val();
 				var shortName = $("#shortName").val();
 				var termsPayment = $("#termsPayment").val();
-				
+				var remarks = $("#remarks").val();
 				var requestData = {
 						aciId:aciId,
 						typeCost:typeCost,
@@ -313,7 +323,8 @@
 						payDetail : JSON.stringify(tabData),
 						weight:weight,
 						contractNo : contractNo,
-						termsPayment:termsPayment
+						termsPayment:termsPayment,
+						remarks:remarks
 				}
 				/**------------------审批新增-------------------- */
 				requestData.FLOW_TITLE = $("#FLOW_TITLE").html();

adm/src/main/webapp/admin/paymentManage/addReceipt.html

@@ -90,6 +90,16 @@
 				</div>
 			</div>
 		</div>
+		<div class="f-content display">
+			<div class="f-c-part">
+				<div class="">
+					<div class="f12-black5">备注：</div>
+					<div class="" style="display: flex;align-items: center;">
+						<textarea name="remarks" id ="remarks"  autocomplete="off" placeholder="请输入备注"  class="layui-textarea" ></textarea>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 	<div class="shadow-content" style="margin-bottom: 125px;">
 		<table id="tableTest" lay-filter="tableFilter"></table>
@@ -184,6 +194,7 @@
 
 				var shortName = $("#shortName").val();
 				var termsPayment = $("#termsPayment").val();
+				var remarks = $("#remarks").val();
 
 				$.request({
 					action : 'PaymentManageAction/addPayment',
@@ -199,7 +210,8 @@
 						payDetail : JSON.stringify(tabData),
 						weight:weight,
 						contractNo : contractNo,
-						termsPayment:termsPayment
+						termsPayment:termsPayment,
+						remarks:remarks
 					},
 					success : function(data) {
 						layer.alert('保存成功!',  function(){

adm/src/main/webapp/admin/paymentManage/paymentManage.html

@@ -42,6 +42,11 @@
 					<input type="text" class="layui-input" id="termsPayment" placeholder="-"  autocomplete="off">
 				</div>
 			</div> 
+			
+			<div class="layui-inline">
+				<label class="f12-gray4">备注:</label>
+				<input type="tel" name="remarks"  id ="remarks"   autocomplete="off" placeholder="请输入备注" class="search-select">
+			</div> 
 		</div>
 	</form>
 	
@@ -137,6 +142,8 @@
 		       ,{field: 'typeDesc', title: '收付类型', width:"10%", }
 		       ,{field: 'priceTypeDesc', title: '费用类型', width:"10%", }
 		       ,{field: 'totalMoneys', title: '实际收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
+		      ,{field: 'aopAllWeight', title: '重量', width:"13%", }
+		      ,{field: 'aopRemarks', title: '备注', width:"13%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
 		      ,{field: 'buyer', title: '付款单位', width:"13%", }
 		      ,{field: 'seller', title: '收款单位', width:"13%"}
 		      ,{field: 'totalMoney', title: '预估收付款金额', width:"15%",edit: 'text',style:'background-color: #C1FFC1; color: #333;'}
@@ -234,13 +241,14 @@
 							id : data.id,
 							totalMoney : data.totalMoney,
 							totalMoneys : data.totalMoneys,
-							termsPayment : data.termsPayment
+							termsPayment : data.termsPayment,
+							aopRemarks:data.aopRemarks
 						},
 
 						success : function(resData) {
 							if (resData.MINStatus == 0) {
 								layer.alert('操作成功！', {icon: 1});
-								reloadPage();
+								reload();
 							} else {
 								layer.alert(resData.MINErrorMessage, {
 									icon: 5,
@@ -311,11 +319,13 @@
 		var fukuan = $("#fukuan").val();
 		var dates = $("#dates").val();
 		var termsPayment = $("#termsPayment").val();
+		var remarks = $("#remarks").val();
     	var param = {};
     	param.shoukuan = shoukuan;
     	param.fukuan = fukuan;
     	param.dates = dates;
     	param.termsPayment = termsPayment;
+    	param.remarks = remarks;
     	exportExcel("../../FinanceToExecl/exportExcelShouFu?",param);
 	});
 
@@ -324,6 +334,7 @@ function reload(){
 	var fukuan = $("#fukuan").val();
 	var dates = $("#dates").val();
 	var termsPayment = $("#termsPayment").val();
+	var remarks = $("#remarks").val();
 
 	//执行重载
 	table.reload('tableTest', {
@@ -334,7 +345,8 @@ function reload(){
 			shoukuan:shoukuan,
 			fukuan:fukuan,
 			dates :dates,
-			termsPayment:termsPayment
+			termsPayment:termsPayment,
+			remarks:remarks
 		}
 	});
 }