长单进度增加合同月查询

到货管理到货入库时set客户id

adm/src/main/java/com/minpay/db/table/model/ApWarehouseDetail.java

@@ -379,7 +379,7 @@ public class ApWarehouseDetail extends AbstractMINBean {
      */
     private String receiptTotal;
     
-    private String awdCustomerId;
+    private String customerId;
 
    
 
@@ -1511,11 +1511,11 @@ public class ApWarehouseDetail extends AbstractMINBean {
         this.receiptTotal = receiptTotal == null ? null : receiptTotal.trim();
     }
     
-    public String getAwdCustomerId() {
-		return awdCustomerId;
+    public String getCustomerId() {
+		return customerId;
 	}
 
-	public void setAwdCustomerId(String awdCustomerId) {
-		this.awdCustomerId = awdCustomerId;
+	public void setCustomerId(String customerId) {
+		this.customerId = customerId;
 	}
 }

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

@@ -144,6 +144,7 @@ public class ContractPlanAction implements IMINAction {
 			@MINParam(key = "customerName") String customerName,
 			@MINParam(key = "type") String type,
 			@MINParam(key = "year") String year,
+			@MINParam(key = "contractMonth") String contractMonth,
 			@MINParam(key = "page", defaultValue = "1") int page,
 			@MINParam(key = "limit", defaultValue = "10") int limit,
 			MINSession session) throws MINBusinessException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, InstantiationException {
@@ -155,6 +156,7 @@ public class ContractPlanAction implements IMINAction {
 			map.put("type", type);					//00采购01销售
 			map.put("conType", "00");			   	//00长单01现货02期货
 			map.put("year",year);		 			//合同有效时间范围	
+			map.put("contractMonth", contractMonth);//合同月
 			List<ApCompanyInf> companyInfList = null;
 			ApCompanyInfExample companyInfExample = new ApCompanyInfExample();
 			// 根据客户Id搜索

adm/src/main/java/com/minpay/guomao/giveoutmanage/GiveStockManageAction.java

@@ -237,6 +237,7 @@ public class GiveStockManageAction implements IMINAction {
 			wareDetail.setOrderId(orderId);
 			wareDetail.setBranchId(user.getBranchId());
 			wareDetail.setRemarks(orderLogistics.getRemarks());
+			wareDetail.setCustomerId(orderLogistics.getCusId());//客户
 			detailList.add(wareDetail);
 			//
 			orderLogistics.setWareId(wareDetailId);				//库存明细id

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

@@ -474,6 +474,9 @@
 				    <if test="fayun != null and fayun != ''">
 						and contrinf.ACI_FAYUN = #{fayun,jdbcType=VARCHAR}
 					</if>
+					<if test="contractMonth != null and contractMonth != ''">
+						and contrinf.ACI_HTYUE = #{contractMonth,jdbcType=VARCHAR}
+					</if>
 				    <if test="companyInfList != null">
 						<!--采购订单 -->
 				    	<if test="type == '00'">

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

@@ -17,7 +17,7 @@
 	      AWD_STOCK_ID, AWD_LICENSE_NUMBER, AWD_BRANCH_ID, 
 	      AWD_COST_FLAG, AWD_KUCUN_FLAG, AWD_YG_WEIGHT, 
 	      AWD_SJ_WEIGHT, AWD_SAVE_NO, AWD_RECEIPT, 
-	      AWD_EXCEL_RECEIPT_ID, AWD_RECEIPT_TOTAL)
+	      AWD_EXCEL_RECEIPT_ID, AWD_RECEIPT_TOTAL,AWD_CUSTOMER_ID)
 	    values 
 	    <foreach item="detail" index="index" collection="detailList" open=""
 				separator="," close="">
@@ -36,7 +36,7 @@
 		      #{detail.stockId,jdbcType=VARCHAR}, #{detail.licenseNumber,jdbcType=VARCHAR}, #{detail.branchId,jdbcType=VARCHAR}, 
 		      #{detail.costFlag,jdbcType=VARCHAR}, #{detail.kucunFlag,jdbcType=VARCHAR}, #{detail.ygWeight,jdbcType=VARCHAR}, 
 		      #{detail.sjWeight,jdbcType=VARCHAR}, #{detail.saveNo,jdbcType=VARCHAR}, #{detail.receipt,jdbcType=VARCHAR}, 
-		      #{detail.excelReceiptId,jdbcType=VARCHAR}, #{detail.receiptTotal,jdbcType=VARCHAR})
+		      #{detail.excelReceiptId,jdbcType=VARCHAR}, #{detail.receiptTotal,jdbcType=VARCHAR},#{detail.customerId,jdbcType=VARCHAR})
 		</foreach>
 
 	</insert>

adm/src/main/webapp/admin/reportManage/LongSingleProgress.html

@@ -37,6 +37,13 @@
 				</div>
 			</div>
 			
+			<div class="layui-inline">
+				<label class="f12-gray4">合同月:</label>
+				<div class="layui-input-inline" style="position: relative;">
+					<input type="text" class="layui-input"  id="contractMonth"  name = "contractMonth" placeholder = "例如:1226~0125">
+				</div>
+			</div>
+			
 			 <div class="d-dashed" style="margin: 10px 0;"></div> 
 			<div class="layui-inline">
 				<label class="f12-gray4">本页计划量合计:</label>
@@ -91,7 +98,7 @@
 	function reloadPage(){
 		var year = $("#year").val();
 		var customerName = $("#customerId").val();
-		
+		var contractMonth = $("#contractMonth").val();
 		var table;
 		layui.use('table', function(){
 			table = layui.table;
@@ -101,7 +108,7 @@
 			    ,limit:10
 			    ,url: 'ContractPlanAction/planningStatistics'
 			    ,method: 'post'
-			    ,where:{MINView:"JSON",type:type,year:year,customerName:customerName}
+			    ,where:{MINView:"JSON",type:type,year:year,customerName:customerName,contractMonth:contractMonth}
 			    ,page: true
 			    ,cols: [[
 			        {type:'numbers',title: '序号'}