6
0

2 کامیت‌ها 5ca7083e36 ... f764d6da51

نویسنده SHA1 پیام تاریخ
  xubh f764d6da51 货道指令3位数 4 سال پیش
  xubh 2643f34915 优化 4 سال پیش

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

@@ -120,7 +120,7 @@
 			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr, vm_equipment_inf ve
 			WHERE vp.PIF_TRANFLOWNO = vd.VOD_ORDER_ID
 			AND vd.VOD_PRO_EQU_REL_ID = vr.VCI_ID
-			AND vr.VCI_ID = ve.VEQ_ID
+			AND vr.VCI_EQUIPMENT_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_PAYTYPE = '91'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
@@ -138,7 +138,7 @@
 			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr, vm_equipment_inf ve
 			WHERE vp.PIF_TRANFLOWNO = vd.VOD_ORDER_ID
 			AND vd.VOD_PRO_EQU_REL_ID = vr.VCI_ID
-			AND vr.VCI_ID = ve.VEQ_ID
+			AND vr.VCI_EQUIPMENT_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_PAYTYPE = '92'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO
@@ -156,7 +156,7 @@
 			FROM vm_payment_inf vp, vm_order_details vd, vm_pro_equ_rel vr, vm_equipment_inf ve
 			WHERE vp.PIF_TRANFLOWNO = vd.VOD_ORDER_ID
 			AND vd.VOD_PRO_EQU_REL_ID = vr.VCI_ID
-			AND vr.VCI_ID = ve.VEQ_ID
+			AND vr.VCI_EQUIPMENT_ID = ve.VEQ_ID
 			AND vp.PIF_STATUS = '1'
 			AND vp.PIF_TYPE = '99'
 			GROUP BY vp.PIF_RCVCSTNO, SUBSTR(PIF_SUCCTIME, 1, 8), ve.VEQ_MACHINE_NO

+ 1 - 1
src/main/webapp/admin/machineManage/addEquproduct.html

@@ -32,7 +32,7 @@
            </div> -->
 		    <label class="layui-form-label">货道指令:</label>
 		    <div class="layui-input-inline">
-		    	<input type="text" name="aisle" maxlength="2" id ="aisle" lay-verify="number" autocomplete="off" placeholder="请输入货道指令" class="layui-input">
+		    	<input type="text" name="aisle" maxlength="3" id ="aisle" lay-verify="number" autocomplete="off" placeholder="请输入货道指令" class="layui-input">
 		    </div>
 		
 		</div>

+ 1 - 1
src/main/webapp/admin/machineManage/editEquproduct.html

@@ -32,7 +32,7 @@
            </div> -->
 		    <label class="layui-form-label">货道指令:</label>
 		    <div class="layui-input-inline">
-		    	<input type="text" name="aisle" maxlength="2" id ="aisle" lay-verify="number" autocomplete="off" placeholder="请输入货道指令" class="layui-input">
+		    	<input type="text" name="aisle" maxlength="3" id ="aisle" lay-verify="number" autocomplete="off" placeholder="请输入货道指令" class="layui-input">
 		    </div>
 		</div>
 		<div class="layui-form-item">