Merge remote-tracking branch 'origin/master'

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

@@ -6,6 +6,7 @@ import com.minpay.common.format.IFormatService;
 import com.minpay.common.service.ILogService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.CommonUtil;
+import com.minpay.common.util.DateUtil;
 import com.minpay.common.util.RegexUtil;
 import com.minpay.db.table.mapper.VmDeliveryInfMapper;
 import com.minpay.db.table.mapper.VmOrderDetailsMapper;
@@ -193,6 +194,7 @@ public class ShOrderManageAction implements IMINAction {
 		}
 
 		vmOrderDetails.setIsDelivery("02");
+		vmOrderDetails.setPickupTime(DateUtil.getCurrentDateTimeString());
 		Service.lookup(IMINDataBaseService.class)
 				.getMybatisMapper(VmOrderDetailsMapper.class)
 				.updateByPrimaryKeySelective(vmOrderDetails);

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

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

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

@@ -59,10 +59,10 @@
 		oi.VOI_EQUIPMENT_ID 	"machineNo",
 		oi.VOI_ID 				"orderNo",
 		di.VDI_STATUS 			"stt",
-		od.VOD_PICKUP_TIME 		"pickUpDates",
+		od.VOD_PICKUP_TIME 		"pickUpTime",
 		od.VOD_PRO_NAME 		"productName",
 		od.VOD_PRO_EQU_REL_ID 	"equrelId",
-		di.VDI_DELIVERY_ID 		"pickupNo",
+		od.VOD_DELIVERY_ID 		"pickupNo",
 		p.VCI_ID				"vciId",
 		p.VCI_NAME 				"userName",
 		r.VCI_SALL_PRICE 		"sallPrice",

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

@@ -88,7 +88,7 @@
                     ,{field: 'detailsId', title: '订单号', width:'12%'}
                     ,{field: 'aisle', title: '货道号', width:'15%'}
                     ,{field: 'imeiAddr', title: '机台号', width:'10%', sort: true}
-                    ,{field: 'detailsId', title: '取货码',width:'8%'}
+                    ,{field: 'pickupNo', title: '取货码',width:'8%'}
                     ,{field: 'productName', title: '商品信息', width:'12%'}
                     ,{field: 'sallPrice', title: '商品价格', width:'12%'}
                     ,{field: 'sttDesc', title: '状态', width:'12%'}