订单传输记录

adm/src/main/java/com/minpay/db/table/own/mapper/OrderTransferManageMapper.java

@@ -0,0 +1,24 @@
+package com.minpay.db.table.own.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.minpay.db.table.model.ImUser;
+import com.minpay.db.table.model.ImUserExample;
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+
+public interface OrderTransferManageMapper extends  IMINMybatisEntityMapper<ImUser, String, ImUserExample> {
+	
+	
+	
+	
+	
+	/**
+	 * 查询订单传输记录
+	 * @param m
+	 * @param row
+	 * @return
+	 */
+	List<Map<String, String>> queryOrderTransferFlow(Map<String, String> m, MINRowBounds row);
+}

adm/src/main/java/com/minpay/guomao/ordermanage/action/OrderTransferManageAction.java

@@ -0,0 +1,65 @@
+package com.minpay.guomao.ordermanage.action;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.minpay.common.bean.User;
+import com.minpay.common.format.IFormatService;
+import com.minpay.common.service.IGuoMaoStockService;
+import com.minpay.common.util.DateUtil;
+import com.minpay.db.table.model.ApWarehouseStock;
+import com.minpay.db.table.model.ApWarehouseStockExample;
+import com.minpay.db.table.own.mapper.OrderTransferManageMapper;
+import com.startup.minpay.frame.business.IMINAction;
+import com.startup.minpay.frame.business.res.MINActionResult;
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+import com.startup.minpay.frame.exception.MINBusinessException;
+import com.startup.minpay.frame.jdbc.MINRowBounds;
+import com.startup.minpay.frame.service.base.IMINDataBaseService;
+import com.startup.minpay.frame.service.base.Service;
+import com.startup.minpay.frame.session.MINSession;
+import com.startup.minpay.frame.target.MINAction;
+import com.startup.minpay.frame.target.MINComponent;
+import com.startup.minpay.frame.target.MINParam;
+
+
+@MINComponent
+public class OrderTransferManageAction implements IMINAction {
+	
+	/**订单传输记录 */
+	public final static String	ORDER_TRANSFER_FLOW			= "orderTransferFlow";
+	
+
+	
+	/**
+	 * 订单传输记录
+	 * @param orderId
+	 * @param session
+	 * @return
+	 * @throws MINBusinessException
+	 */
+	@MINAction(value = ORDER_TRANSFER_FLOW)
+	public MINActionResult orderTransferFlow(
+			@MINParam(key = "orderId") String orderId,
+			@MINParam(key = "page", defaultValue = "1") int page,
+			@MINParam(key = "limit", defaultValue = "10") int limit,
+			MINSession session) throws MINBusinessException {
+		MINActionResult res = new MINActionResult();
+		Map<String,String> map = new HashMap<String, String>();
+		map.put("orderId",orderId);
+		//分页
+		MINRowBounds rows = new MINRowBounds(page, limit);
+		List<Map<String,String>> list = Service.lookup(IMINDataBaseService.class).getMybatisMapper(OrderTransferManageMapper.class).queryOrderTransferFlow(map, rows);
+		list = Service.lookup(IFormatService.class).formatDate(list, "atfErpDate");
+		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
+		return res;
+	}
+	
+
+	
+	
+	
+	
+}

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.minpay.db.table.own.mapper.OrderTransferManageMapper">
+	<select id="queryOrderTransferFlow" resultType="hashmap" parameterType="java.util.Map">
+	   SELECT    
+		    		f.ATF_ID  					"atfId",
+		    		f.ATF_ORDER_ID				"atfOrderId",
+		    		f.ATF_ERP_DATE				"atfErpDate",
+		    		f.ATF_TRANSFERRED_NUM		"atfTransferredNum",
+		    		f.ATF_TRANSFER_NUM			"atfTransferNum",
+		    		f.ATF_REMAINING_TRANS_NUM	"atfRemainingtransNum",
+		    		f.ATF_PRE_PRICE     		"atfPrePrice",
+		    		f.ATF_REAL_TOTAL			"atfRealTotal",
+		    		f.ATF_PRE_TOTAL				"atfPreTotal",
+		    		f.ATF_ERP_NO				"atfErpNo",
+		    		f.ATF_REAL_PRICE			"atfRealPrice",
+		    		r.AOI_NAME					"aoiName"
+	    FROM   ap_transfer_flow f
+	    LEFT JOIN ap_order_inf r
+	    ON r.AOI_ID = f.ATF_ORDER_ID
+	   where 1=1
+		<if test="orderId != null and orderId != ''">
+			and f.ATF_ORDER_ID = #{orderId,jdbcType=VARCHAR}
+		</if>
+	</select>
+</mapper>

adm/src/main/webapp/admin/orderManage/manageDetail.html

@@ -18,6 +18,7 @@
 	    <li id="kucun">入库总量添加</li>
 	    <li id="outZong">出库总量添加</li>
 	    <li id ="invoiceInfo">发票</li>
+	    <li id ="transferFlow">订单传输记录</li>
 	  </ul>
 	  
 	  <script>
@@ -66,6 +67,9 @@
 		<div class="layui-tab-item">
 			<iframe id="iframeNine"  align="center" width="100%" src=""  frameborder="no" border="0" marginwidth="0" marginheight="0"></iframe>
 		</div>
+		<div class="layui-tab-item">
+			<iframe id="iframeTen"  align="center" width="100%" src=""  frameborder="no" border="0" marginwidth="0" marginheight="0"></iframe>
+		</div>
 	</div>
 </div>
 <script>
@@ -139,7 +143,12 @@
             	$("#iframeFour")[0].src = $("#iframeFour")[0].src;
         		$('#iframeFour').attr('src','../invoiceManage/otherBranchInvoiceDetail.html?conType='+conType+'&orderId='+orderId+'&type='+type+'&tabPageId='+tabPageId);
         		iframeInit('iframeFour');
+        	}else if('订单传输记录' == clickLiName){
+        		$("#iframeTen")[0].src = $("#iframeFour")[0].src;
+        		$('#iframeTen').attr('src','../orderManage/orderManageTransferFlow.html?conType='+conType+'&orderId='+orderId+'&type='+type+'&tabPageId='+tabPageId);
+        		iframeInit('iframeTen');
         	}
+        	
         });    
     });
  

adm/src/main/webapp/admin/orderManage/orderManageTransferFlow.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>订单传输记录</title>
+    <script src="../../js/min-loader-next.js"></script>
+</head>
+	<body class="body-content">
+		<div class="shadow-content"  >
+			<table id="tableTestOne" lay-filter="tableFilterOne"></table>
+		</div>
+
+<script>
+	
+	var orderId = getQueryString("orderId");
+
+	$("#toggle").click(function() {
+		$(this).html($("#content").is(":hidden") ? "收起" + "<i class='iconfont up iconSelect_drop-down'/></i>" : "展开" +
+			"<i class='iconfont up iconSelect_drop-down'/></i>");
+		$("#content").slideToggle();
+	});
+	
+	var table;
+	layui.use('table', function(){
+		table = layui.table;
+		table.render({
+			 id : 'tableTestOne'
+		    ,elem: '#tableTestOne'
+		    ,limit:10
+		    ,url: 'OrderTransferManageAction/orderTransferFlow' //数据接口
+		    ,method: 'post'
+		    ,where:{MINView:"JSON",orderId:orderId}
+		    ,page: true //开启分页
+		    ,cols: [[ //表头
+		              {type:'numbers',title: '序号'}
+		       ,{field: 'aoiName', title: '订单名称', width:"10%"}
+		      ,{field: 'atfErpDate', title: 'ERP过账日期', width:"10%"}
+		      ,{field: 'atfTransferredNum', title: '已传输重量', width:"10%"}
+		      ,{field: 'atfTransferNum', title: '本次传输数量',width:"10%"}
+		      ,{field: 'atfRemainingtransNum', title: '剩余传输数量',width:"10%"}
+		      ,{field: 'atfPrePrice', title: '预结算单价'}
+		      ,{field: 'atfPreTotal', title: '本次预结算总价'}
+		      ,{field: 'atfRealPrice', title: '实际结算单价'}
+		      ,{field: 'atfRealTotal', title: '本次实际结算总价'}
+		      ,{field: 'atfRealTotal', title: '本次实际结算总价'}
+		      ,{field: 'atfErpNo', title: 'ERP单号'}
+		    ]]
+		    ,done: function(res, curr, count){
+		        //如果是异步请求数据方式，res即为你接口返回的信息。
+		        console.log(res);
+		        //得到当前页码
+		        console.log(curr); 
+		        //得到数据总量
+		        console.log(count);
+		        hoverOpenImg();//显示大图
+		      }
+		    ,even: true //开启隔行背景
+		  });
+		  
+	});
+
+    function reload(){
+	         //执行重载
+	     	table.reload('tableTestOne', {
+		        page: {
+		          curr: 1 //重新从第 1 页开始
+		        }
+		        ,where: {
+		        	orderId : orderId
+		        }
+	      	});
+    }
+	
+    function cancle(){
+		$('#formNameOne')[0].reset();
+	}
+
+</script>
+     
+  
+  
+</body>
+
+</html>