正常商品购买 生成提货单时没有更新订单明细表的提货单编号

src/main/java/com/minpay/shouhuo/deliveryaction/DeliveryAction.java

@@ -579,6 +579,11 @@ public class DeliveryAction implements IMINAction{
 				Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmDeliveryInfMapper.class)
 						.insert(dlInf);
+				//订单明细表set提货单编号
+				detInf.setDeliveryId(dlId);
+				Service.lookup(IMINDataBaseService.class)
+						.getMybatisMapper(VmOrderDetailsMapper.class)
+						.updateByPrimaryKeySelective(detInf);
 			}
 		}
 	}

src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java

@@ -74,6 +74,12 @@ public class MachineManageAction implements IMINAction {
         User user = session.getUser();
         //渠道
         String channel = user.getChannel();
+        VmEquipmentInf vmEquipmentInf = Service.lookup(IMINDataBaseService.class)
+                                                .getMybatisMapper(VmEquipmentInfMapper.class)
+                                                .selectByPrimaryKey(equId);
+        if (vmEquipmentInf == null){
+            throw new MINBusinessException("该设备不存在!");
+    }
         // 查询条件
         Map<String, String> map = new HashMap<String, String>();
         map.put("channel", "V01");
@@ -87,6 +93,7 @@ public class MachineManageAction implements IMINAction {
         list = new MINCopyFormat("{perState:'sttDesc',isPromotton:'isPromottonDesc',isFragile:'isFragileDesc'}").format(list);
         list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'PROEQUREL_STATE',isPromottonDesc:'IS_PROMOTION',isFragileDesc:'IS_FRAGILE'}");
         //传递数据
+        res.set("equType",vmEquipmentInf.getEquType());
         res.set(IMINBusinessConstant.F_PAGING_LAY, list);
         return res;
     }