root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:一键移库代码优化测试

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2024-09-03 08:59:53 +08:00
parent 166dd99b76
commit 3356c2fa8e
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml
View File

@@ -170,11 +170,12 @@
AND P.vehicle_code2 NOT LIKE '%YBHC%' AND P.vehicle_code2 NOT LIKE '%YBHC%'
AND (p.ing_task_code IS NULL or p.ing_task_code = '') AND (p.ing_task_code IS NULL or p.ing_task_code = '')
AND p.region_code IN ( 'YLHC' )) a AND p.region_code IN ( 'YLHC' )) a
WHERE 1=1
<if test="query.point_code != null"> <if test="query.point_code != null">
and a.point_code like CONCAT('%', #{query.point_code}, '%') and a.pointCode = #{query.point_code}
</if> </if>
<if test="query.status != null"> <if test="query.status != null">
and a.status = #{query.point_code} and a.status = #{query.status}
</if> </if>
ORDER BY a.pointCode ASC ORDER BY a.pointCode ASC
</select> </select>

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -290,6 +290,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
.eq(SchBasePoint::getIs_used, true) .eq(SchBasePoint::getIs_used, true)
.eq(SchBasePoint::getRegion_code, "YLHC") .eq(SchBasePoint::getRegion_code, "YLHC")
.notLike(SchBasePoint::getVehicle_code2, "YBHC") .notLike(SchBasePoint::getVehicle_code2, "YBHC")
.isNotNull(SchBasePoint::getVehicle_code2)
.ne(SchBasePoint::getVehicle_code2, "")
.and(slam -> slam.isNull(SchBasePoint::getIng_task_code) .and(slam -> slam.isNull(SchBasePoint::getIng_task_code)
.or() .or()
.eq(SchBasePoint::getIng_task_code, "") .eq(SchBasePoint::getIng_task_code, "")

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
View File

@@ -155,6 +155,8 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
.eq(SchBasePoint::getIs_used, true) .eq(SchBasePoint::getIs_used, true)
.eq(SchBasePoint::getRegion_code, "YLHC") .eq(SchBasePoint::getRegion_code, "YLHC")
.eq(SchBasePoint::getPoint_code, pointCode) .eq(SchBasePoint::getPoint_code, pointCode)
.isNotNull(SchBasePoint::getVehicle_code2)
.ne(SchBasePoint::getVehicle_code2, "")
.notLike(SchBasePoint::getVehicle_code2, "YBHC") .notLike(SchBasePoint::getVehicle_code2, "YBHC")
.and(slam -> slam.isNull(SchBasePoint::getIng_task_code) .and(slam -> slam.isNull(SchBasePoint::getIng_task_code)
.or() .or()

2
lms/nladmin-ui/src/views/wms/sch/movestor/index.vue
View File

@@ -115,7 +115,7 @@ export default {
download: false, download: false,
reset: false reset: false
}, },
query: {} query: {status:'0'}
}) })
}, },
data() { data() {