|
@@ -835,6 +835,8 @@ public class BizDayworkController extends BaseController {
|
|
public AjaxResult add(@RequestBody BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
|
|
public AjaxResult add(@RequestBody BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException {
|
|
System.out.println("新增报工数据:" + bizDaywork);
|
|
System.out.println("新增报工数据:" + bizDaywork);
|
|
if (bizDaywork.getId() == null) {
|
|
if (bizDaywork.getId() == null) {
|
|
|
|
+ //单批量
|
|
|
|
+ BizLot bizLot = bizLotService.query().eq("lot_code", bizDaywork.getLotCode()).one();
|
|
//查询出该生产计划的投产总批数
|
|
//查询出该生产计划的投产总批数
|
|
Integer lotNumber = bizDayworkService.getLotNumber(bizDaywork.getProductionPlanDetailId());
|
|
Integer lotNumber = bizDayworkService.getLotNumber(bizDaywork.getProductionPlanDetailId());
|
|
//查询出该生产计划的当前生产批数
|
|
//查询出该生产计划的当前生产批数
|
|
@@ -868,7 +870,7 @@ public class BizDayworkController extends BaseController {
|
|
bizDayworkItem.setProductionPlanDetailId(bizDaywork.getProductionPlanDetailId());
|
|
bizDayworkItem.setProductionPlanDetailId(bizDaywork.getProductionPlanDetailId());
|
|
bizDayworkItem.setTechnologicalProcessId(bizDaywork.getTechnologicalProcessId());
|
|
bizDayworkItem.setTechnologicalProcessId(bizDaywork.getTechnologicalProcessId());
|
|
bizDayworkItem.setQualifiedNum(bizDaywork.getProcessQualifiedNum());
|
|
bizDayworkItem.setQualifiedNum(bizDaywork.getProcessQualifiedNum());
|
|
- bizDayworkItem.setProdNum(bizDaywork.getProdNum());
|
|
|
|
|
|
+ bizDayworkItem.setProdNum(bizLot.getProductionQuantity());
|
|
bizDayworkItem.setProcessStepNumber(bizDaywork.getProcessStepNumber());
|
|
bizDayworkItem.setProcessStepNumber(bizDaywork.getProcessStepNumber());
|
|
/* 20230408修改 */
|
|
/* 20230408修改 */
|
|
// 如果是修改,则取当前工序的工序详情
|
|
// 如果是修改,则取当前工序的工序详情
|