wilson
/
rongxing-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

创建新卷BUG修改

master
rui_li 4 years ago
parent
171eee6e82
commit
dc2ed8e02e
3 changed files with 23 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  2. 28
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  3. 13
      src/main/resources/mapper/schedule/ScheduleMapper.xml

1
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
View File

@ -502,6 +502,7 @@ public class ScheduleController {
public R createNewRoll(@RequestBody SearchScheduleData inData){ public R createNewRoll(@RequestBody SearchScheduleData inData){
scheduleService.createNewRoll(inData); scheduleService.createNewRoll(inData);
return R.ok() return R.ok()
.put("success", true)
.put("msg", "操作成功!"); .put("msg", "操作成功!");
} }
// //

28
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
View File

@ -602,18 +602,18 @@ public class ScheduleServiceImpl implements ScheduleService {
String workCenterNo = inData.getWorkCenterNo(); String workCenterNo = inData.getWorkCenterNo();
//获取rollId和normalRollId //获取rollId和normalRollId
Map<String, Object> tempMap = scheduleMapper.getRollIdAndNormalRollIdByCon(inData); Map<String, Object> tempMap = scheduleMapper.getRollIdAndNormalRollIdByCon(inData);
String strRollId = String.valueOf(tempMap.get("rollId"));
//判断null //判断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"; 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 sfdcRollData = new SfdcRollData(itemNo, -1, "N", "N", itemNo, itemNo, rollId, normalRollId, seqNo, 0);
sfdcRollData.setSite(site); sfdcRollData.setSite(site);
sfdcRollData.setOrderNo(orderNo); sfdcRollData.setOrderNo(orderNo);
sfdcRollData.setItemNo(itemNo);
sfdcRollData.setRollNo(currentRollNo);
sfdcRollData.setCreatedDate(new Date()); sfdcRollData.setCreatedDate(new Date());
sfdcRollData.setCreatedBy(username); sfdcRollData.setCreatedBy(username);
sfdcRollData.setOriRollNo(currentRollNo); sfdcRollData.setOriRollNo(currentRollNo);
@ -679,7 +681,7 @@ public class ScheduleServiceImpl implements ScheduleService {
//刷新表的表的时间记录数据 //刷新表的表的时间记录数据
params.add(workCenterNo); 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(orderNo);
params.add(itemNo); params.add(itemNo);
//执行存储过程获取结果 //执行存储过程获取结果
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("getSfdcRollSerialNo",params);
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("getScheduleNextItemNo",params);
//处理结果集 //处理结果集
Map<String, Object> resultMap = resultList.get(0); Map<String, Object> 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);
} }

13
src/main/resources/mapper/schedule/ScheduleMapper.xml
View File

@ -213,6 +213,7 @@
T.SeqNo seqNo, T.QtyRequired qtyRequired, T.QtyReported qtyReported, T.QtyApprove qtyApprove, ROUND(T.TimeRequired, 3) timeRequired, 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.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.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, 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, 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, D.FactorUnit factorUnit, D.Efficiency efficiency,D.NextItemNo nextItemNo, dbo.Get_SOOpsDescription(T.Site,T.OrderNo,D.NextItemNo) nextItemDesc,
@ -738,7 +739,7 @@
</select> </select>
<!--检查派工单是否关闭--> <!--检查派工单是否关闭-->
<select id="countSfdcRollByRollNo" parameterType="SearchScheduleData" resultType="java.lang.Integer">
<select id="checkScheduleStatus" parameterType="SearchScheduleData" resultType="java.lang.Integer">
SELECT COUNT(1) FROM SOScheduledRouting ssr SELECT COUNT(1) FROM SOScheduledRouting ssr
<where> <where>
<if test="site != null and site != ''"> <if test="site != null and site != ''">
@ -762,7 +763,7 @@
<!--获取rollId和normalRollId--> <!--获取rollId和normalRollId-->
<select id="getRollIdAndNormalRollIdByCon" parameterType="SearchScheduleData" resultType="java.util.HashMap"> <select id="getRollIdAndNormalRollIdByCon" parameterType="SearchScheduleData" resultType="java.util.HashMap">
SELECT MAX(RollID) rollId, MAX(NormalRollID) normalRollId FROM SFDC_Rolls
SELECT MAX(RollID) rollId, MAX(NormalRollID) normalRollId FROM SFDC_Rolls ssr
<where> <where>
<if test="site != null and site != ''"> <if test="site != null and site != ''">
AND ssr.Site = #{site} AND ssr.Site = #{site}
@ -775,17 +776,17 @@
<!--插入sfdcRolls的数据--> <!--插入sfdcRolls的数据-->
<insert id="insertSfdcRolls" parameterType="SfdcRollData"> <insert id="insertSfdcRolls" parameterType="SfdcRollData">
INSERT INTO SFDC_Rolls(Site, OrderNo, RollNo, CreatedDate, Createdby, CreatedOpsItemNo, CreatedOpsSeqNo, CurrentOpsItemNo, LastFinishedOpsItemNo, FinishedDate,
INSERT INTO SFDC_Rolls(Site, OrderNo, RollID, RollNo, CreatedDate, Createdby, CreatedOpsItemNo, CreatedOpsSeqNo, CurrentOpsItemNo, LastFinishedOpsItemNo, FinishedDate,
FinishedFlag, OnLineFlag, PauseFlag, OriRollNo, Remark, StartOpsItemNo, RollType, RollType_DB, RollQty, FirstLevelRollNo, FGRollFlag, FGRollID, FinishedFlag, OnLineFlag, PauseFlag, OriRollNo, Remark, StartOpsItemNo, RollType, RollType_DB, RollQty, FirstLevelRollNo, FGRollFlag, FGRollID,
NormalRollID, CombineFlag, VirtualRollFlag, VirtualLinkRollNo, CQCPassFlag, CQCInspectedFlag, CQCNeedInspectFlag) NormalRollID, CombineFlag, VirtualRollFlag, VirtualLinkRollNo, CQCPassFlag, CQCInspectedFlag, CQCNeedInspectFlag)
VALUES(#{site}, #{orderNo}, #{rollNo}, #{createdDate}, #{createdBy}, #{createdOpsItemNo}, #{createdOpsSeqNo}, #{currentOpsItemNo}, #{lastFinishedOpsItemNo}, #{finishedDate},
VALUES(#{site}, #{orderNo}, #{rollId}, #{rollNo}, #{createdDate}, #{createdBy}, #{createdOpsItemNo}, #{createdOpsSeqNo}, #{currentOpsItemNo}, #{lastFinishedOpsItemNo}, #{finishedDate},
#{finishedFlag}, #{onLineFlag}, #{pauseFlag}, #{oriRollNo}, #{remark}, #{startOpsItemNo}, #{rollType}, #{rollTypeDb}, #{rollQty}, #{firstLevelRollNo}, #{fgRollFlag}, #{fgRollId}, #{finishedFlag}, #{onLineFlag}, #{pauseFlag}, #{oriRollNo}, #{remark}, #{startOpsItemNo}, #{rollType}, #{rollTypeDb}, #{rollQty}, #{firstLevelRollNo}, #{fgRollFlag}, #{fgRollId},
#{normalRollId}, #{combineFlag}, #{virtualRollFlag}, #{virtualLinkRollNo}, #{cqcPassFlag}, #{cqcInspectedFlag}, #{cqcNeedInspectFlag}) #{normalRollId}, #{combineFlag}, #{virtualRollFlag}, #{virtualLinkRollNo}, #{cqcPassFlag}, #{cqcInspectedFlag}, #{cqcNeedInspectFlag})
</insert> </insert>
<!--插入sfdcRollOps的数据--> <!--插入sfdcRollOps的数据-->
<insert id="insertSfdcRolls" parameterType="SfdcRollData">
INSERT INTO SFDC_Rolls(Site, OrderNo, RollNo, ItemNo, SeqNo, StartProdFlag, FinishedFlag, PauseFlag,
<insert id="insertSfdcRollOps" parameterType="SfdcRollData">
INSERT INTO SFDC_RollOps(Site, OrderNo, RollNo, ItemNo, SeqNo, StartProdFlag, FinishedFlag, PauseFlag,
Remark, QtyReported, QtyDefected, ReportedFlag) Remark, QtyReported, QtyDefected, ReportedFlag)
VALUES(#{site}, #{orderNo}, #{rollNo}, #{itemNo}, #{seqNo}, #{startProdFlag}, #{finishedFlag}, #{pauseFlag}, VALUES(#{site}, #{orderNo}, #{rollNo}, #{itemNo}, #{seqNo}, #{startProdFlag}, #{finishedFlag}, #{pauseFlag},
#{remark}, #{qtyReported}, #{qtyDefected}, #{reportedFlag}) #{remark}, #{qtyReported}, #{qtyDefected}, #{reportedFlag})

Write Preview
Loading…
Cancel
Save