diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 0daa671..f428203 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -502,6 +502,7 @@ public class ScheduleController { public R createNewRoll(@RequestBody SearchScheduleData inData){ scheduleService.createNewRoll(inData); return R.ok() + .put("success", true) .put("msg", "操作成功!"); } // diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 1d62d14..68fa512 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -602,18 +602,18 @@ public class ScheduleServiceImpl implements ScheduleService { String workCenterNo = inData.getWorkCenterNo(); //获取rollId和normalRollId Map tempMap = scheduleMapper.getRollIdAndNormalRollIdByCon(inData); - String strRollId = String.valueOf(tempMap.get("rollId")); //判断null - if (null == strRollId || "null".equalsIgnoreCase(strRollId)){ - strRollId = "0"; - } - Integer rollId = Integer.parseInt(strRollId); - String strNormalRollId = String.valueOf(tempMap.get("normalRollId")); - //判断null - if (null == strNormalRollId || "null".equalsIgnoreCase(strNormalRollId)){ + String strRollId = ""; + String strNormalRollId = ""; + if(tempMap != null){ + strRollId = String.valueOf(tempMap.get("rollId")); + strNormalRollId = String.valueOf(tempMap.get("normalRollId")); + }else{ + strRollId = "1"; strNormalRollId = "0"; } - Integer normalRollId = Integer.parseInt(strNormalRollId); + Integer rollId = Integer.parseInt(strRollId) + 1; + Integer normalRollId = Integer.parseInt(strNormalRollId) + 1; //获取当前的卷号数据 @@ -625,6 +625,8 @@ public class ScheduleServiceImpl implements ScheduleService { SfdcRollData sfdcRollData = new SfdcRollData(itemNo, -1, "N", "N", itemNo, itemNo, rollId, normalRollId, seqNo, 0); sfdcRollData.setSite(site); sfdcRollData.setOrderNo(orderNo); + sfdcRollData.setItemNo(itemNo); + sfdcRollData.setRollNo(currentRollNo); sfdcRollData.setCreatedDate(new Date()); sfdcRollData.setCreatedBy(username); sfdcRollData.setOriRollNo(currentRollNo); @@ -679,7 +681,7 @@ public class ScheduleServiceImpl implements ScheduleService { //刷新表的表的时间记录数据 params.add(workCenterNo); - procedureMapper.execProduceData("startProduceSchedule", params); + procedureMapper.execProduceData("createNewRollSfdcTimeData", params); } /** @@ -719,11 +721,11 @@ public class ScheduleServiceImpl implements ScheduleService { params.add(orderNo); params.add(itemNo); //执行存储过程获取结果 - List> resultList = procedureMapper.getProcedureData("getSfdcRollSerialNo",params); + List> resultList = procedureMapper.getProcedureData("getScheduleNextItemNo",params); //处理结果集 Map resultMap = resultList.get(0); - String strSerialNo = String.valueOf(resultMap.get("rollNo")); - return Integer.parseInt(strSerialNo); + String strItemNo = String.valueOf(resultMap.get("nextItemNo")); + return Integer.parseInt(strItemNo); } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index cc4a6f5..0f81709 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -213,6 +213,7 @@ T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove, ROUND(T.TimeRequired, 3) timeRequired, T.TimeReported timeReported, T.PlanStartTime planStartTime, T.PlanFinishTime planFinishTime, T.BarcodeID barcodeId, T.Remark remark, T.Crewsize crewSize, T.ClosedFlag closedFlag, T.QtyScrapt qtyScrapt, T.OutWorkFlag outWorkFlag, T.S_ScheduledDate scheduledDate, + t.S_WorkCenterNo workCenterNo, T.S_ResourceID resourceId, dbo.getWorkCenterResourceDesc(T.Site, t.S_WorkCenterNo, T.S_ResourceID) resourceDesc, E.S_ScheduledSeqNo scheduledSeqNo, T.S_ShiftNo shiftNo, D.MachSetupTime machSetupTime, D.MachRunFactor machRunFactor, D.FactorUnit factorUnit, D.Efficiency efficiency,D.NextItemNo nextItemNo, dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.NextItemNo) nextItemDesc, @@ -738,7 +739,7 @@ - SELECT COUNT(1) FROM SOScheduledRouting ssr @@ -762,7 +763,7 @@