|
@@ -626,9 +626,9 @@ public class BizDayworkController extends BaseController {
|
|
//拿到同一个工序步骤的报工信息
|
|
//拿到同一个工序步骤的报工信息
|
|
List<BizDayworkItem> totalItem = bizDayworkItemService.getList(item);
|
|
List<BizDayworkItem> totalItem = bizDayworkItemService.getList(item);
|
|
//如果要删除的报工是这个工序的最后一条报工,且是首序
|
|
//如果要删除的报工是这个工序的最后一条报工,且是首序
|
|
- if (totalItem.size() == 1 && bizDayworkItem.getProcessStepNumber().equals(firstItem.getProcessStepNumber())) {
|
|
|
|
- return error("首序报工至少存在一条");
|
|
|
|
- } else {
|
|
|
|
|
|
+// if (totalItem.size() == 1 && bizDayworkItem.getProcessStepNumber().equals(firstItem.getProcessStepNumber())) {
|
|
|
|
+//// return error("首序报工至少存在一条");
|
|
|
|
+// } else {
|
|
//删除废品
|
|
//删除废品
|
|
List<BizDayworkItemReject> dayworkItemRejectList = bizDayworkItemRejectService.query().eq("daywork_item_id", bizDayworkItem.getId()).list();
|
|
List<BizDayworkItemReject> dayworkItemRejectList = bizDayworkItemRejectService.query().eq("daywork_item_id", bizDayworkItem.getId()).list();
|
|
//普通报工是周转申请的时候,向daywork上存合格数,分选报工则是工序已完成的时候存
|
|
//普通报工是周转申请的时候,向daywork上存合格数,分选报工则是工序已完成的时候存
|
|
@@ -677,7 +677,16 @@ public class BizDayworkController extends BaseController {
|
|
deleTemporanyPeople(bizDayworkItem);
|
|
deleTemporanyPeople(bizDayworkItem);
|
|
//删除工序检验
|
|
//删除工序检验
|
|
bizDayworkItemService.removeById(bizDayworkItem);
|
|
bizDayworkItemService.removeById(bizDayworkItem);
|
|
|
|
+ if (totalItem.size() == 1 && bizDayworkItem.getProcessStepNumber().equals(firstItem.getProcessStepNumber())) {
|
|
|
|
+ // 还要删炉号 载具 报工
|
|
|
|
+ BizDaywork bizDaywork = bizDayworkService.getById(bizDayworkItem.getDayworkId());
|
|
|
|
+ List<BizDayworkCarrier> carrier = bizDayworkCarrierService.query().eq("daywork_id", bizDayworkItem.getDayworkId()).list();
|
|
|
|
+ List<BizFurnaceNoInfo> bizFurnaceNoInfo = bizFurnaceNoInfoService.query().eq("daywork_id", bizDayworkItem.getDayworkId()).list();
|
|
|
|
+ bizDayworkService.removeById(bizDaywork.getId());
|
|
|
|
+ bizDayworkCarrierService.removeBatchByIds(carrier);
|
|
|
|
+ bizFurnaceNoInfoService.removeBatchByIds(bizFurnaceNoInfo);
|
|
}
|
|
}
|
|
|
|
+// }
|
|
|
|
|
|
// List<Long> id = new ArrayList<>();
|
|
// List<Long> id = new ArrayList<>();
|
|
// id.add(bizDayworkItem.getDayworkId());
|
|
// id.add(bizDayworkItem.getDayworkId());
|