|
@@ -302,7 +302,7 @@ public class BizDayworkItemController extends BaseController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 设置上一工段,周转用
|
|
// 设置上一工段,周转用
|
|
- List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("process_id", item.getProcessId()).list();
|
|
|
|
|
|
+ List<BizDayworkItem> dayworkItemList = bizDayworkItemService.query().lt("status", 4).eq("lot_id",item.getLotId()).eq("process_id", item.getProcessId()).list();
|
|
for (int i = 0; i < dayworkItemList.size(); i++) {
|
|
for (int i = 0; i < dayworkItemList.size(); i++) {
|
|
if (dayworkItemList.get(i).getDeptName() != null && !"".equals(dayworkItemList.get(i).getDeptName())) {
|
|
if (dayworkItemList.get(i).getDeptName() != null && !"".equals(dayworkItemList.get(i).getDeptName())) {
|
|
item.setPreDeptName(dayworkItemList.get(i).getDeptName());
|
|
item.setPreDeptName(dayworkItemList.get(i).getDeptName());
|