优化统计

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -350,7 +350,7 @@ public class invCardManageAction implements IMINAction {
 		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "pickUpTime");
 		detailList = Service.lookup(IFormatService.class).formatDateTime(detailList, "createTime");
 		detailList = new MINCopyFormat("{stt:'sttDesc'}").format(detailList);
-		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'PICKUP_STT'}");
+		detailList = Service.lookup(IFormatService.class).formatEnum(detailList,"{sttDesc:'ORDER_PICKUP_STT'}");
 		//返回数据
 		res.set(IMINBusinessConstant.F_PAGING_LAY, detailList);
 		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getMaxRows());

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

@@ -4,17 +4,17 @@
 
 	<select id="selectOrderDetail" resultType="hashmap" parameterType="java.util.Map">
 	    SELECT
-		d.VOI_ID  				"orderNo",
+		o.VOD_DETAILS_ID  				"orderNo",
 		o.VOD_PRODUCT_ID 		"productId",
 		o.VOD_PRO_NAME 			"productName",
 		p.VCI_NAME 				"userName",
 		o.VOD_PRO_EQU_REL_ID 		"equrelId",
 		r.VCI_EQUIPMENT_ID 		"machineNo",
-		d.VOI_ORDER_AMT 		"orderAmt",
-		d.VOI_CREATE_TIME 		"createTime",
-		d.VOI_PICKUP_NO 		"pickupNo",
-		d.VOI_PICKUP_TIME 		"pickUpTime",
-		d.VOI_PICKUP_STT 		"stt",
+		o.VOD_AMOUNT 		"orderAmt",
+		o.VOD_CREATE_TIME 		"createTime",
+		o.VOD_DELIVERY_ID 		"pickupNo",
+		o.VOD_PICKUP_TIME 		"pickUpTime",
+		o.VOD_IS_DELIVERY 		"stt",
 		r.VCI_SALL_PRICE 		"sallPrice",
 		r.VCI_GAME_PRICE 		"gamePrice",
 		r.VCI_COST_PRICE 		"costPrice",
@@ -28,48 +28,47 @@
 		<if test="branchId != null and branchId != ''">
 			and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
 		</if>
-    	<if test="pickupNo != null and pickupNo != ''">
-			AND	 d.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
+    	<if test="pickUpCode != null and pickUpCode != ''">
+			AND	 o.VOD_DELIVERY_ID  = #{pickUpCode,jdbcType=VARCHAR}
 		</if>
 		<if test="pickUpState != null and pickUpState != ''">
-			AND	 d.VOI_PICKUP_STT  = #{pickUpState,jdbcType=VARCHAR}
+			AND	 o.VOD_IS_DELIVERY  = #{pickUpState,jdbcType=VARCHAR}
 		</if>
 		<if test="machineNo != null and machineNo != ''">
-			AND	 r.VCI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	 e.VEQ_IMEI_ADDR  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="equrelId != null and equrelId != ''">
-			AND	 o.VOD_PRO_EQU_REL_ID  = #{equrelId,jdbcType=VARCHAR}
+			AND	 r.VCI_AISLE  = #{equrelId,jdbcType=VARCHAR}
 		</if>
 		<if test="creatdDtes != null and creatdDtes != ''">
-			and substr(VOI_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
+			and substr(VOD_CREATE_TIME,1,8) between substr((#{creatdDtes, jdbcType=VARCHAR}),1,8)
 			and substr((#{creatdDtes, jdbcType=VARCHAR}),12,19)
 		</if>
 		<if test="pickUpDates != null and pickUpDates != ''">
-			and substr(VOI_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
+			and substr(VOD_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
 			and substr((#{pickUpDates, jdbcType=VARCHAR}),12,19)
 		</if>
 		and VCI_EXEIT_STATE = "00"
 		and VOI_STATE = "00"
 		and VCI_STATUS = "00"
-		and VOI_IS_DRAW = "01"
-		and VOI_PICKUP_STT in ("00", "01")
 	</select>
 	<select id="selectPickupRecord" resultType="hashmap" parameterType="java.util.Map">
 		SELECT
 		oi.VOI_EQUIPMENT_ID 	"machineNo",
 		oi.VOI_ID 				"orderNo",
 		di.VDI_STATUS 			"stt",
-		oi.VOI_PICKUP_TIME 		"pickUpDates",
+		od.VOD_PICKUP_TIME 		"pickUpDates",
 		od.VOD_PRO_NAME 		"productName",
 		od.VOD_PRO_EQU_REL_ID 	"equrelId",
-		oi.VOI_PICKUP_NO 		"pickupNo",
+		di.VDI_DELIVERY_ID 		"pickupNo",
 		p.VCI_ID				"vciId",
 		p.VCI_NAME 				"userName",
 		r.VCI_SALL_PRICE 		"sallPrice",
 		r.VCI_GAME_PRICE 		"gamePrice",
 		r.VCI_COST_PRICE 		"costPrice",
 		e.VEQ_IMEI_ADDR 		"imeiAddr",
-		r.VCI_AISLE 			"aisle"
+		r.VCI_AISLE 			"aisle",
+		od.VOD_DETAILS_ID 		"detailsId"
 		from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r,vm_equipment_inf e
 		where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
 		and VOD_ORDER_ID = oi.VOI_ID
@@ -78,22 +77,22 @@
 		and r.VCI_EQUIPMENT_ID = e.VEQ_ID
 		and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
 		<if test="machineNo != null and machineNo != ''">
-			AND	oi.VOI_EQUIPMENT_ID  = #{machineNo,jdbcType=VARCHAR}
+			AND	e.VEQ_IMEI_ADDR  = #{machineNo,jdbcType=VARCHAR}
 		</if>
 		<if test="orderNo != null and orderNo != ''">
-			AND	oi.VOI_ID  = #{orderNo,jdbcType=VARCHAR}
+			AND	od.VOD_DETAILS_ID  = #{orderNo,jdbcType=VARCHAR}
 		</if>
 		<if test="equrelId != null and equrelId != ''">
-			AND	od.VOD_PRO_EQU_REL_ID  = #{equrelId,jdbcType=VARCHAR}
+			AND	r.VCI_AISLE   = #{equrelId,jdbcType=VARCHAR}
 		</if>
 		<if test="vciId != null and vciId != ''">
 			AND	p.VCI_ID  = #{vciId,jdbcType=VARCHAR}
 		</if>
 		<if test="pickupNo != null and pickupNo != ''">
-			AND	oi.VOI_PICKUP_NO  = #{pickupNo,jdbcType=VARCHAR}
+			AND	di.VDI_DELIVERY_ID  = #{pickupNo,jdbcType=VARCHAR}
 		</if>
 		<if test="pickUpDates != null and pickUpDates != ''">
-			and substr(VOI_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
+			and substr(VOD_PICKUP_TIME,1,8) between substr((#{pickUpDates, jdbcType=VARCHAR}),1,8)
 			and substr((#{pickUpDates, jdbcType=VARCHAR}),12,19)
 		</if>
 	</select>

src/main/webapp/admin/invCardManage/invCardManage.html

@@ -108,7 +108,7 @@
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 				{type:'numbers',title: '序号',width:'5%'}
-				,{field: 'orderNo', title: '订单号', width:'10%'}
+				,{field: 'detailsId', title: '订单号', width:'10%'}
 		      	,{field: 'productName', title: '商品信息', width:'12%'}
 		      	,{field: 'sallPrice', title: '商品价格', width:'12%'}
 		      	,{field: 'imeiAddr', title: '机台号', width:'12%'}

src/main/webapp/admin/pickupRecordManage/pickupRecord.html

@@ -85,10 +85,10 @@
                 ,cols: [[ //表头
                     {type:'numbers',title: '序号',width:'5%'}
                     ,{field: 'vciId', title: '用户ID', width:'12%'}
-                    ,{field: 'orderNo', title: '订单号', width:'12%'}
-                    ,{field: 'equrelId', title: '货道号', width:'15%'}
+                    ,{field: 'detailsId', title: '订单号', width:'12%'}
+                    ,{field: 'aisle', title: '货道号', width:'15%'}
                     ,{field: 'imeiAddr', title: '机台号', width:'10%', sort: true}
-                    ,{field: 'aislereLoadFun', title: '取货码',width:'8%'}
+                    ,{field: 'detailsId', title: '取货码',width:'8%'}
                     ,{field: 'productName', title: '商品信息', width:'12%'}
                     ,{field: 'sallPrice', title: '商品价格', width:'12%'}
                     ,{field: 'sttDesc', title: '状态', width:'12%'}