|
@@ -255,7 +255,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.in("uu.DepartmentID", "A007", "A012", "A017")
|
|
.in("uu.DepartmentID", "A007", "A012", "A017")
|
|
// .likeRight("m.Code", "01.")
|
|
// .likeRight("m.Code", "01.")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
.isNotNull("uu.JobNo"));
|
|
.isNotNull("uu.JobNo"));
|
|
|
|
|
|
for (Map<String, Object> map : pickingList) {
|
|
for (Map<String, Object> map : pickingList) {
|
|
@@ -316,7 +316,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.eq("uu.DepartmentID", "A008")
|
|
.eq("uu.DepartmentID", "A008")
|
|
// .likeRight("m.Code", "01.")
|
|
// .likeRight("m.Code", "01.")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
.isNotNull("uu.JobNo"));
|
|
.isNotNull("uu.JobNo"));
|
|
|
|
|
|
for (Map<String, Object> map : pickingList) {
|
|
for (Map<String, Object> map : pickingList) {
|
|
@@ -380,7 +380,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.eq("uu.IsDelete", 0)
|
|
.eq("uu.IsDelete", 0)
|
|
.in("uu.DepartmentID", "A007", "A012", "A017")
|
|
.in("uu.DepartmentID", "A007", "A012", "A017")
|
|
.isNotNull("uu.JobNo")
|
|
.isNotNull("uu.JobNo")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
// .likeRight("m.Code", "01.")
|
|
// .likeRight("m.Code", "01.")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
|
|
|
|
@@ -440,7 +440,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.eq("uu.IsDelete", 0)
|
|
.eq("uu.IsDelete", 0)
|
|
.eq("uu.DepartmentID", "A008")
|
|
.eq("uu.DepartmentID", "A008")
|
|
.isNotNull("uu.JobNo")
|
|
.isNotNull("uu.JobNo")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
// .likeRight("m.Code", "01.")
|
|
// .likeRight("m.Code", "01.")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
);
|
|
);
|
|
@@ -502,7 +502,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.gt("sbc.correct_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
|
|
.gt("sbc.correct_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
|
|
.isNotNull("uu.JobNo")
|
|
.isNotNull("uu.JobNo")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
);
|
|
);
|
|
for (Map<String, Object> map : correctList) {
|
|
for (Map<String, Object> map : correctList) {
|
|
// 出库时间
|
|
// 出库时间
|
|
@@ -536,7 +536,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.eq("st.status", StatusConstant.YES)
|
|
.eq("st.status", StatusConstant.YES)
|
|
.eq("st.del_flag", 0)
|
|
.eq("st.del_flag", 0)
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
);
|
|
);
|
|
|
|
|
|
for (Map<String, Object> map : transferPickingList) {
|
|
for (Map<String, Object> map : transferPickingList) {
|
|
@@ -599,7 +599,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
|
|
.eq("st.status", StatusConstant.YES)
|
|
.eq("st.status", StatusConstant.YES)
|
|
.eq("st.del_flag", 0)
|
|
.eq("st.del_flag", 0)
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
// .notIn("m.Code", "01.002.0045", "01.002.0124", "01.002.0381", "01.002.0383")
|
|
- .ne("m.CategoryCode", "99.999.")
|
|
|
|
|
|
+ .notIn("m.CategoryCode", "99.999.", "01.007.")
|
|
);
|
|
);
|
|
|
|
|
|
for (Map<String, Object> map : transferBackList) {
|
|
for (Map<String, Object> map : transferBackList) {
|