批量推货测试

src/main/java/com/minpay/common/action/VendingMachineAction.java

@@ -11,16 +11,8 @@ import com.minpay.common.service.ILogService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.DataUtil;
 import com.minpay.common.util.DateUtil;
-import com.minpay.db.table.mapper.VmDeliveryInfMapper;
-import com.minpay.db.table.mapper.VmEquipmentInfMapper;
-import com.minpay.db.table.mapper.VmProEquRelMapper;
-import com.minpay.db.table.mapper.VmPushNewsMapper;
-import com.minpay.db.table.model.VmDeliveryInf;
-import com.minpay.db.table.model.VmEquipmentInf;
-import com.minpay.db.table.model.VmEquipmentInfExample;
-import com.minpay.db.table.model.VmProEquRel;
-import com.minpay.db.table.model.VmProEquRelExample;
-import com.minpay.db.table.model.VmPushNews;
+import com.minpay.db.table.mapper.*;
+import com.minpay.db.table.model.*;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.MINHttpServletRequestContext;
 import com.startup.minpay.frame.business.res.MINActionResult;
@@ -50,7 +42,13 @@ public class VendingMachineAction implements IMINAction {
 	/**
 	 * 推送温度
 	 */
-	public final static String  PUSH_TEMPERATURE = "pushTemperature"; 
+	public final static String  PUSH_TEMPERATURE = "pushTemperature";
+	/**
+	 * 推货(测试)
+	 */
+	public final static String  CE_PUSH_GOODS = "cePushGoods";
+
+
 	
 	
 	/**
@@ -74,48 +72,55 @@ public class VendingMachineAction implements IMINAction {
 			MINHttpServletRequestContext  MINRequest
 			) throws MINBusinessException, InterruptedException {
 		MINActionResult res = new MINActionResult();
-		
-		//校验是否有此机器
-		VmEquipmentInfExample veiExample = new VmEquipmentInfExample();
-		veiExample.createCriteria().andImeiAddrEqualTo(imeiAddr).andStateEqualTo("00");
-		
-		List<VmEquipmentInf> veiList = Service.lookup(IMINDataBaseService.class) 
-											  .getMybatisMapper(VmEquipmentInfMapper.class)
-											  .selectByExample(veiExample);
+
 		//设置返回值
 		Map<String, String> returnData = new HashMap<String, String> ();
 		String code = "200";
-		//增加接收消息
-		VmPushNews vpn = new VmPushNews();
-		vpn.setState("01");
-		// 机器存在
-		if(veiList.size() != 1){
+		// 查询推货数量
+		VmDeliveryInf vdi = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmDeliveryInfMapper.class)
+				.selectByPrimaryKey(deliveryNo);
+		if(vdi == null){
+			returnData.put("code", "999");
+			returnData.put("msg", "提货编号不存在");
+			res.set("returnData", returnData);
+			return res;
+		}
+
+		//查询货道
+		VmProEquRel vmProEquRel = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmProEquRelMapper.class).selectByPrimaryKey(vdi.getProEquRelId());
+		if(vmProEquRel == null){
+			returnData.put("code", "999");
+			returnData.put("msg", "货道不存在");
+			res.set("returnData", returnData);
+			return res;
+		}
+
+		//校验是否有此机器
+		VmEquipmentInf vmEquipmentInf = Service.lookup(IMINDataBaseService.class)
+				.getMybatisMapper(VmEquipmentInfMapper.class)
+				.selectByPrimaryKey(vmProEquRel.getEquipmentId());
+
+		if(vmEquipmentInf == null){
 			returnData.put("code", "999");
 			returnData.put("msg", "机器异常");
 			res.set("returnData", returnData);
 			return res;
 		}
-		
-		// 查询当前货物数量
-		VmProEquRelExample exp = new VmProEquRelExample();
-		// VCI_AISLE				varchar(5) 					COMMENT '货道指令',
-		// VCI_EQUIPMENT_ID 		varchar(20)  				COMMENT '设备Id',
-		exp.createCriteria().andAisleEqualTo(cargoNo).andEquipmentIdEqualTo(veiList.get(0).getId()).andExeitStateEqualTo("00");
-		List<VmProEquRel> relList = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmProEquRelMapper.class).selectByExample(exp);
-		// 机器存在
-		if(relList.size() != 1){
+		if(!vmProEquRel.getAisle().equals(cargoNo) || !imeiAddr.equals(vmEquipmentInf.getImeiAddr())){
 			returnData.put("code", "999");
-			returnData.put("msg", "机器货道异常，不存在货道或者多个货道指令。");
+			returnData.put("msg", "所传货道或机器不一致");
 			res.set("returnData", returnData);
 			return res;
 		}
-				
-		// 查询推货数量
-		VmDeliveryInf vdi = Service.lookup(IMINDataBaseService.class)
-									.getMybatisMapper(VmDeliveryInfMapper.class)
-									.selectByPrimaryKey(deliveryNo);
+
+		//增加接收消息
+		VmPushNews vpn = new VmPushNews();
+		vpn.setState("01");
+
 		// 商品剩余量VCI_PRODUCT_NUMS
-		int proYuliang = CommonUtil.objToint(relList.get(0).getProductNums());
+		int proYuliang = CommonUtil.objToint(vmProEquRel.getProductNums());
 		if(proYuliang <= 0){
 			returnData.put("code", "999");
 			returnData.put("msg", "商品余量不足，推货失败");
@@ -309,6 +314,67 @@ public class VendingMachineAction implements IMINAction {
 			) throws MINBusinessException {
 		
 	}
-	
-	
+	/**
+	 * 推货（测试专用）
+	 * @param imeiAddr   机器imei编码
+	 * @param cargoNo	  货道指令编号
+	 * @param deliveryNo 推货编号
+	 * @param returnUrl  回调地址
+	 * @param  openId
+	 * @return
+	 * @throws MINBusinessException
+	 * @throws InterruptedException
+	 */
+	@MINAction(value = CE_PUSH_GOODS,session=false)
+	public MINActionResult cePushGoods(
+			@MINParam(key = "imeiAddr") String imeiAddr,
+			@MINParam(key = "cargoNo") String cargoNo,
+			@MINParam(key = "deliveryNo") String deliveryNo,
+			@MINParam(key = "returnUrl") String returnUrl,
+			@MINParam(key = "openId") String openId,
+			MINHttpServletRequestContext  MINRequest
+	) throws MINBusinessException, InterruptedException {
+		MINActionResult res = new MINActionResult();
+		//设置返回值
+		Map<String, String> returnData = new HashMap<String, String> ();
+		String code = "200";
+		//校验openid 和机器的关系
+
+		//进行推货
+		List<String> restList = new ArrayList<String>();
+		restList.add("[a|");
+
+		restList.add(imeiAddr);     //机台号
+		restList.add("|");
+		restList.add(deliveryNo);	//订单号
+		restList.add("]");
+		restList.add("(bFA 00 06 00 24");
+		String cargoNo16 = DataUtil.str10ToStr16(Integer.valueOf(cargoNo));
+		if(cargoNo16.length() == 1){
+			cargoNo16 = "0".concat(cargoNo16);
+		}
+		restList.add(" ".concat(cargoNo16));
+		restList.add(")");
+		String param  = DataUtil.listToString(restList);
+		try {//进行通知
+			code = Service.lookup(IClientService.class).sendMsg(param, imeiAddr);
+			if(!"200".equals(code)){
+				returnData.put("code", code);
+				returnData.put("msg", "推货失败");
+			}else{
+				returnData.put("code", code);
+				returnData.put("msg", "推货成功");
+			}
+		} catch (Exception e) {
+			returnData.put("code", "999");
+			returnData.put("msg", "推货失败");
+		}
+		res.set("returnData", returnData);
+		//记录操作日志
+		String logInfo = "测试推货》》售货机:"+imeiAddr+"货单号:"+cargoNo+",货状态："+returnData.get("code");
+		Log.info(logInfo);
+		Service.lookup(ILogService.class).logging(null, logInfo);
+		return res;
+	}
+
 }

src/main/java/com/minpay/common/service/impl/VendingMachineServiceImpl.java

@@ -202,98 +202,105 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 		String deliveryId = strArr[2];
 		//推货状态
 		String state = strArr[3];
+		boolean status = deliveryId.contains("T");
+		if(status){ //测试推货的
 
-		VmDeliveryInf vdi = Service.lookup(IMINDataBaseService.class)
-									.getMybatisMapper(VmDeliveryInfMapper.class)
-									.selectByPrimaryKey(deliveryId);
+		}else{
 
-		String cargoState = "";
-		//成功的不在处理
-		if(vdi!= null && !"2".equals(vdi.getStatus())){
-			//订单详情编号
-			String orddetid = vdi.getOrdDetId();
-			//查询订单详情
-			VmOrderDetails vod = Service.lookup(IMINDataBaseService.class)
-					.getMybatisMapper(VmOrderDetailsMapper.class)
-					.selectByPrimaryKey(orddetid);
-			if("01".equals(state)){
-				cargoState ="00";
-				// 提货状态:0未出货1部分出货2已出货3卡货4清零5处理中
-				vdi.setStatus("1");
-				//商品关联编号
-				String equRelId = vod.getProEquRelId();
-				VmProEquRel vpe = Service.lookup(IMINDataBaseService.class)
-						.getMybatisMapper(VmProEquRelMapper.class)
-						.selectByPrimaryKey(equRelId);
 
-				if(!vpe.getProductNums().equals("0")) {
-					//变更数量
-					vpe.setProductNums(CommonUtil.subtract(vpe.getProductNums(), "1"));
-				}
-				vpe.setModifyTime(DateUtil.getCurrentDateTimeString());
-				Service.lookup(IMINDataBaseService.class)
-						.getMybatisMapper(VmProEquRelMapper.class)
-						.updateByPrimaryKeySelective(vpe);
-				// 增加提货数量 + 1D:\
-				String deliveryNums = CommonUtil.add(vdi.getDeliveryNums(), "1");
-				vdi.setDeliveryNums(deliveryNums);
-				if(deliveryNums.equals(vdi.getProNums())){//都提完了
-					VmOrderDetails vmOrderDetails = new VmOrderDetails();
-					vmOrderDetails.setDetailsId(orddetid);
-					vmOrderDetails.setIsDelivery("01");
-					vmOrderDetails.setPickupTime(DateUtil.getCurrentDateTimeString());
+			VmDeliveryInf vdi = Service.lookup(IMINDataBaseService.class)
+					.getMybatisMapper(VmDeliveryInfMapper.class)
+					.selectByPrimaryKey(deliveryId);
+
+			String cargoState = "";
+			//成功的不在处理
+			if(vdi!= null && !"2".equals(vdi.getStatus())){
+				//订单详情编号
+				String orddetid = vdi.getOrdDetId();
+				//查询订单详情
+				VmOrderDetails vod = Service.lookup(IMINDataBaseService.class)
+						.getMybatisMapper(VmOrderDetailsMapper.class)
+						.selectByPrimaryKey(orddetid);
+				if("01".equals(state)){
+					cargoState ="00";
+					// 提货状态:0未出货1部分出货2已出货3卡货4清零5处理中
+					vdi.setStatus("1");
+					//商品关联编号
+					String equRelId = vod.getProEquRelId();
+					VmProEquRel vpe = Service.lookup(IMINDataBaseService.class)
+							.getMybatisMapper(VmProEquRelMapper.class)
+							.selectByPrimaryKey(equRelId);
+
+					if(!vpe.getProductNums().equals("0")) {
+						//变更数量
+						vpe.setProductNums(CommonUtil.subtract(vpe.getProductNums(), "1"));
+					}
+					vpe.setModifyTime(DateUtil.getCurrentDateTimeString());
 					Service.lookup(IMINDataBaseService.class)
-							.getMybatisMapper(VmOrderDetailsMapper.class)
-							.updateByPrimaryKeySelective(vmOrderDetails);
-				}
+							.getMybatisMapper(VmProEquRelMapper.class)
+							.updateByPrimaryKeySelective(vpe);
+					// 增加提货数量 + 1D:\
+					String deliveryNums = CommonUtil.add(vdi.getDeliveryNums(), "1");
+					vdi.setDeliveryNums(deliveryNums);
+					if(deliveryNums.equals(vdi.getProNums())){//都提完了
+						VmOrderDetails vmOrderDetails = new VmOrderDetails();
+						vmOrderDetails.setDetailsId(orddetid);
+						vmOrderDetails.setIsDelivery("01");
+						vmOrderDetails.setPickupTime(DateUtil.getCurrentDateTimeString());
+						Service.lookup(IMINDataBaseService.class)
+								.getMybatisMapper(VmOrderDetailsMapper.class)
+								.updateByPrimaryKeySelective(vmOrderDetails);
+					}
 
-			}else {//出货失败
-				cargoState ="01";
-				vdi.setStatus("3");
-			}
-			// 全部提货完毕
-			if(vdi.getProNums().equals(vdi.getDeliveryNums())) {
-				// 提货状态:0未出货1部分出货2已出货3卡货4清零5处理中
-				vdi.setStatus("2");
-			}
-			//变更推货状态
-			Service.lookup(IMINDataBaseService.class)
-					.getMybatisMapper(VmDeliveryInfMapper.class)
-					.updateByPrimaryKeySelective(vdi);
-			//查询订单是否都提货
-			VmOrderDetailsExample  vmOrderDetailsExample = new VmOrderDetailsExample();
-			vmOrderDetailsExample.createCriteria().andOrderIdEqualTo(vod.getOrderId()).andDeliveryIdIsNotNull().andIsDeliveryEqualTo("00");
-			List<VmOrderDetails> vmOrderDetailsList = Service.lookup(IMINDataBaseService.class)
-					.getMybatisMapper(VmOrderDetailsMapper.class)
-					.selectByExample(vmOrderDetailsExample);
-			if(vmOrderDetailsList.size() == 0){
-				VmOrderInf vmOrderInf = new VmOrderInf();
-				vmOrderInf.setId(vod.getOrderId());
-				vmOrderInf.setPickupStt("01");
+				}else {//出货失败
+					cargoState ="01";
+					vdi.setStatus("3");
+				}
+				// 全部提货完毕
+				if(vdi.getProNums().equals(vdi.getDeliveryNums())) {
+					// 提货状态:0未出货1部分出货2已出货3卡货4清零5处理中
+					vdi.setStatus("2");
+				}
+				//变更推货状态
 				Service.lookup(IMINDataBaseService.class)
-						.getMybatisMapper(VmOrderInfMapper.class)
-						.updateByPrimaryKeySelective(vmOrderInf);
+						.getMybatisMapper(VmDeliveryInfMapper.class)
+						.updateByPrimaryKeySelective(vdi);
+				//查询订单是否都提货
+				VmOrderDetailsExample  vmOrderDetailsExample = new VmOrderDetailsExample();
+				vmOrderDetailsExample.createCriteria().andOrderIdEqualTo(vod.getOrderId()).andDeliveryIdIsNotNull().andIsDeliveryEqualTo("00");
+				List<VmOrderDetails> vmOrderDetailsList = Service.lookup(IMINDataBaseService.class)
+						.getMybatisMapper(VmOrderDetailsMapper.class)
+						.selectByExample(vmOrderDetailsExample);
+				if(vmOrderDetailsList.size() == 0){
+					VmOrderInf vmOrderInf = new VmOrderInf();
+					vmOrderInf.setId(vod.getOrderId());
+					vmOrderInf.setPickupStt("01");
+					Service.lookup(IMINDataBaseService.class)
+							.getMybatisMapper(VmOrderInfMapper.class)
+							.updateByPrimaryKeySelective(vmOrderInf);
 
-			}
+				}
 
-			VmPushNewsExample  vmPushNewsExample = new VmPushNewsExample();
-			vmPushNewsExample.createCriteria().andDeliverynoEqualTo(deliveryId);
-			List<VmPushNews> VmPushNewsList = Service.lookup(IMINDataBaseService.class)
-													.getMybatisMapper(VmPushNewsMapper.class)
-													.selectByExample(vmPushNewsExample);
-			if(VmPushNewsList.size() == 1 ){
-				//变更消息状态
-				VmPushNews vpm = new VmPushNews();
-				vpm.setFlowno(VmPushNewsList.get(0).getFlowno());
-				vpm.setState("02");
-				vpm.setCargoState(cargoState);
-				vpm.setModifyTime(DateUtil.getCurrentDateTimeString());
-				Service.lookup(IMINDataBaseService.class)
+				VmPushNewsExample  vmPushNewsExample = new VmPushNewsExample();
+				vmPushNewsExample.createCriteria().andDeliverynoEqualTo(deliveryId);
+				List<VmPushNews> VmPushNewsList = Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmPushNewsMapper.class)
-						.updateByPrimaryKeySelective(vpm);
-			}
+						.selectByExample(vmPushNewsExample);
+				if(VmPushNewsList.size() == 1 ){
+					//变更消息状态
+					VmPushNews vpm = new VmPushNews();
+					vpm.setFlowno(VmPushNewsList.get(0).getFlowno());
+					vpm.setState("02");
+					vpm.setCargoState(cargoState);
+					vpm.setModifyTime(DateUtil.getCurrentDateTimeString());
+					Service.lookup(IMINDataBaseService.class)
+							.getMybatisMapper(VmPushNewsMapper.class)
+							.updateByPrimaryKeySelective(vpm);
+				}
 
+			}
 		}
+
  		//[q|机序列号（5位）|执行订单号（10位）|ok]
 		/**设置放回*/
 		List<String> restList = new ArrayList<String>();

src/main/java/com/minpay/db/table/model/VmDeliveryInf.java

@@ -148,6 +148,22 @@ public class VmDeliveryInf extends AbstractMINBean {
     private String modifyTime;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    private String branchid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @mbggenerated
+     */
+    private String proEquRelId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column vm_delivery_inf.VDI_DELIVERY_ID
      *
@@ -578,4 +594,52 @@ public class VmDeliveryInf extends AbstractMINBean {
     public void setModifyTime(String modifyTime) {
         this.modifyTime = modifyTime == null ? null : modifyTime.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @return the value of vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    public String getBranchid() {
+        return branchid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_BRANCHID
+     *
+     * @param branchid the value for vm_delivery_inf.VDI_BRANCHID
+     *
+     * @mbggenerated
+     */
+    public void setBranchid(String branchid) {
+        this.branchid = branchid == null ? null : branchid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @return the value of vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @mbggenerated
+     */
+    public String getProEquRelId() {
+        return proEquRelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @param proEquRelId the value for vm_delivery_inf.VDI_PRO_EQU_REL_ID
+     *
+     * @mbggenerated
+     */
+    public void setProEquRelId(String proEquRelId) {
+        this.proEquRelId = proEquRelId == null ? null : proEquRelId.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/VmDeliveryInfExample.java

@@ -1593,6 +1593,162 @@ public class VmDeliveryInfExample {
             addCriterion("VDI_MODIFY_TIME not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
+
+        public Criteria andBranchidIsNull() {
+            addCriterion("VDI_BRANCHID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidIsNotNull() {
+            addCriterion("VDI_BRANCHID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidEqualTo(String value) {
+            if(value == null ){
+                andBranchidIsNull();
+            } else {
+                addCriterion("VDI_BRANCHID =", value, "branchid");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotEqualTo(String value) {
+            if(value == null ){
+                andBranchidIsNotNull();
+            } else {
+                addCriterion("VDI_BRANCHID <>", value, "branchid");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidGreaterThan(String value) {
+            addCriterion("VDI_BRANCHID >", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidGreaterThanOrEqualTo(String value) {
+            addCriterion("VDI_BRANCHID >=", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidLessThan(String value) {
+            addCriterion("VDI_BRANCHID <", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidLessThanOrEqualTo(String value) {
+            addCriterion("VDI_BRANCHID <=", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidLike(String value) {
+            addCriterion("VDI_BRANCHID like", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotLike(String value) {
+            addCriterion("VDI_BRANCHID not like", value, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidIn(List<String> values) {
+            addCriterion("VDI_BRANCHID in", values, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotIn(List<String> values) {
+            addCriterion("VDI_BRANCHID not in", values, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidBetween(String value1, String value2) {
+            addCriterion("VDI_BRANCHID between", value1, value2, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchidNotBetween(String value1, String value2) {
+            addCriterion("VDI_BRANCHID not between", value1, value2, "branchid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdIsNull() {
+            addCriterion("VDI_PRO_EQU_REL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdIsNotNull() {
+            addCriterion("VDI_PRO_EQU_REL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdEqualTo(String value) {
+            if(value == null ){
+                andProEquRelIdIsNull();
+            } else {
+                addCriterion("VDI_PRO_EQU_REL_ID =", value, "proEquRelId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdNotEqualTo(String value) {
+            if(value == null ){
+                andProEquRelIdIsNotNull();
+            } else {
+                addCriterion("VDI_PRO_EQU_REL_ID <>", value, "proEquRelId");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdGreaterThan(String value) {
+            addCriterion("VDI_PRO_EQU_REL_ID >", value, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("VDI_PRO_EQU_REL_ID >=", value, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdLessThan(String value) {
+            addCriterion("VDI_PRO_EQU_REL_ID <", value, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdLessThanOrEqualTo(String value) {
+            addCriterion("VDI_PRO_EQU_REL_ID <=", value, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdLike(String value) {
+            addCriterion("VDI_PRO_EQU_REL_ID like", value, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdNotLike(String value) {
+            addCriterion("VDI_PRO_EQU_REL_ID not like", value, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdIn(List<String> values) {
+            addCriterion("VDI_PRO_EQU_REL_ID in", values, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdNotIn(List<String> values) {
+            addCriterion("VDI_PRO_EQU_REL_ID not in", values, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdBetween(String value1, String value2) {
+            addCriterion("VDI_PRO_EQU_REL_ID between", value1, value2, "proEquRelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProEquRelIdNotBetween(String value1, String value2) {
+            addCriterion("VDI_PRO_EQU_REL_ID not between", value1, value2, "proEquRelId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/resources/com/minpay/db/table/mapper/VmDeliveryInfMapper.xml

@@ -24,6 +24,8 @@
     <result column="VDI_CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
     <result column="VDI_MODIFY_USER" jdbcType="VARCHAR" property="modifyUser" />
     <result column="VDI_MODIFY_TIME" jdbcType="VARCHAR" property="modifyTime" />
+    <result column="VDI_BRANCHID" jdbcType="VARCHAR" property="branchid" />
+    <result column="VDI_PRO_EQU_REL_ID" jdbcType="VARCHAR" property="proEquRelId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -99,7 +101,7 @@
     VDI_DELIVERY_ID, VDI_CHANNEL, VDI_EQUIPMENT_ID, VDI_PERSON_ID, VDI_ORD_DET_ID, VDI_PRO_TYPE, 
     VDI_PRO_NAME, VDI_PRO_PRICE, VDI_PRO_NUMS, VDI_AMOUNT, VDI_STATUS, VDI_CARGO_WAY, 
     VDI_DELIVERY_NUMS, VDI_REMARKS, VDI_CREATE_USER, VDI_CREATE_TIME, VDI_MODIFY_USER, 
-    VDI_MODIFY_TIME
+    VDI_MODIFY_TIME, VDI_BRANCHID, VDI_PRO_EQU_REL_ID
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample" resultMap="BaseResultMap">
     <!--
@@ -157,15 +159,15 @@
       VDI_PRO_NAME, VDI_PRO_PRICE, VDI_PRO_NUMS, 
       VDI_AMOUNT, VDI_STATUS, VDI_CARGO_WAY, 
       VDI_DELIVERY_NUMS, VDI_REMARKS, VDI_CREATE_USER, 
-      VDI_CREATE_TIME, VDI_MODIFY_USER, VDI_MODIFY_TIME
-      )
+      VDI_CREATE_TIME, VDI_MODIFY_USER, VDI_MODIFY_TIME, 
+      VDI_BRANCHID, VDI_PRO_EQU_REL_ID)
     values (#{deliveryId,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{equipmentId,jdbcType=VARCHAR}, 
       #{personId,jdbcType=VARCHAR}, #{ordDetId,jdbcType=VARCHAR}, #{proType,jdbcType=VARCHAR}, 
       #{proName,jdbcType=VARCHAR}, #{proPrice,jdbcType=VARCHAR}, #{proNums,jdbcType=VARCHAR}, 
       #{amount,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{cargoWay,jdbcType=VARCHAR}, 
       #{deliveryNums,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}
-      )
+      #{createTime,jdbcType=VARCHAR}, #{modifyUser,jdbcType=VARCHAR}, #{modifyTime,jdbcType=VARCHAR}, 
+      #{branchid,jdbcType=VARCHAR}, #{proEquRelId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.VmDeliveryInf">
     <!--
@@ -228,6 +230,12 @@
       <if test="modifyTime != null">
         VDI_MODIFY_TIME,
       </if>
+      <if test="branchid != null">
+        VDI_BRANCHID,
+      </if>
+      <if test="proEquRelId != null">
+        VDI_PRO_EQU_REL_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="deliveryId != null">
@@ -284,6 +292,12 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="branchid != null">
+        #{branchid,jdbcType=VARCHAR},
+      </if>
+      <if test="proEquRelId != null">
+        #{proEquRelId,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.VmDeliveryInfExample" resultType="java.lang.Integer">
@@ -357,6 +371,12 @@
       <if test="record.modifyTime != null">
         VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="record.branchid != null">
+        VDI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.proEquRelId != null">
+        VDI_PRO_EQU_REL_ID = #{record.proEquRelId,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -385,7 +405,9 @@
       VDI_CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
       VDI_CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
       VDI_MODIFY_USER = #{record.modifyUser,jdbcType=VARCHAR},
-      VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR}
+      VDI_MODIFY_TIME = #{record.modifyTime,jdbcType=VARCHAR},
+      VDI_BRANCHID = #{record.branchid,jdbcType=VARCHAR},
+      VDI_PRO_EQU_REL_ID = #{record.proEquRelId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -448,6 +470,12 @@
       <if test="modifyTime != null">
         VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
       </if>
+      <if test="branchid != null">
+        VDI_BRANCHID = #{branchid,jdbcType=VARCHAR},
+      </if>
+      <if test="proEquRelId != null">
+        VDI_PRO_EQU_REL_ID = #{proEquRelId,jdbcType=VARCHAR},
+      </if>
     </set>
     where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
   </update>
@@ -473,7 +501,9 @@
       VDI_CREATE_USER = #{createUser,jdbcType=VARCHAR},
       VDI_CREATE_TIME = #{createTime,jdbcType=VARCHAR},
       VDI_MODIFY_USER = #{modifyUser,jdbcType=VARCHAR},
-      VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR}
+      VDI_MODIFY_TIME = #{modifyTime,jdbcType=VARCHAR},
+      VDI_BRANCHID = #{branchid,jdbcType=VARCHAR},
+      VDI_PRO_EQU_REL_ID = #{proEquRelId,jdbcType=VARCHAR}
     where VDI_DELIVERY_ID = #{deliveryId,jdbcType=VARCHAR}
   </update>
 </mapper>