|
@@ -241,7 +241,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
.ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:00:00"))
|
|
|
.in("swd.StockChangeType", 20, 23)
|
|
|
.eq("uu.IsDelete", 0)
|
|
|
- .in("uu.DepartmentID", "A007", "A012")
|
|
|
+ .in("uu.DepartmentID", "A007", "A012", "A017")
|
|
|
.likeRight("m.Code", "01.")
|
|
|
.notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
|
.isNotNull("uu.JobNo"));
|
|
@@ -365,7 +365,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
|
List<Map<String, Object>> backList = baseMapper.getReturnWarehouse(Wrappers.query()
|
|
|
.ge("sb.operation_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
|
|
|
.eq("uu.IsDelete", 0)
|
|
|
- .in("uu.DepartmentID", "A007", "A012")
|
|
|
+ .in("uu.DepartmentID", "A007", "A012", "A017")
|
|
|
.isNotNull("uu.JobNo")
|
|
|
.likeRight("m.Code", "01.")
|
|
|
.notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|