|
|
@ -95,7 +95,7 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
SfdcRollOpsData result = scheduleMapper.getCurrentRollOpsBySeqNo(inData); |
|
|
SfdcRollOpsData result = scheduleMapper.getCurrentRollOpsBySeqNo(inData); |
|
|
//判断是否查询到结果 |
|
|
//判断是否查询到结果 |
|
|
if (null == result) { |
|
|
if (null == result) { |
|
|
return new SfdcRollOpsData(); |
|
|
|
|
|
|
|
|
throw new RRException("不存在上机卷!"); |
|
|
} |
|
|
} |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
@ -724,12 +724,13 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 获取sfdcRoll的卷号 |
|
|
* TODO 获取sfdcRoll的卷号 |
|
|
* @author LR |
|
|
|
|
|
* @date 2021/12/13 15:52 |
|
|
|
|
|
|
|
|
* |
|
|
* @param site |
|
|
* @param site |
|
|
* @param orderNo |
|
|
* @param orderNo |
|
|
* @param itemNo |
|
|
* @param itemNo |
|
|
* @return java.lang.String |
|
|
* @return java.lang.String |
|
|
|
|
|
* @author LR |
|
|
|
|
|
* @date 2021/12/13 15:52 |
|
|
**/ |
|
|
**/ |
|
|
public String getSfdcRollSerialNo(String site, String orderNo, int itemNo) { |
|
|
public String getSfdcRollSerialNo(String site, String orderNo, int itemNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -746,12 +747,13 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 获取派工单的后道工序 |
|
|
* TODO 获取派工单的后道工序 |
|
|
* @author LR |
|
|
|
|
|
* @date 2021/12/13 16:46 |
|
|
|
|
|
|
|
|
* |
|
|
* @param site |
|
|
* @param site |
|
|
* @param orderNo |
|
|
* @param orderNo |
|
|
* @param itemNo |
|
|
* @param itemNo |
|
|
* @return java.lang.Integer |
|
|
* @return java.lang.Integer |
|
|
|
|
|
* @author LR |
|
|
|
|
|
* @date 2021/12/13 16:46 |
|
|
**/ |
|
|
**/ |
|
|
public Integer getScheduleNextItemNo(String site, String orderNo, int itemNo) { |
|
|
public Integer getScheduleNextItemNo(String site, String orderNo, int itemNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -787,9 +789,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 校验是否可以开始调机 |
|
|
* TODO 校验是否可以开始调机 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/27 15:15 |
|
|
* @date 2021/12/27 15:15 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void checkStartTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
public void checkStartTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -812,9 +815,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 开始调机的操作 |
|
|
* TODO 开始调机的操作 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/27 15:21 |
|
|
* @date 2021/12/27 15:21 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void startTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String currentTime) { |
|
|
public void startTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String currentTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -830,7 +834,6 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public Map<String, Object> checkDownTimeCode(SearchScheduleData inData) { |
|
|
public Map<String, Object> checkDownTimeCode(SearchScheduleData inData) { |
|
|
//公共参数 |
|
|
//公共参数 |
|
|
@ -874,9 +877,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用存储过程返回停机代码的结果 |
|
|
* TODO 调用存储过程返回停机代码的结果 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/27 11:55 |
|
|
* @date 2021/12/27 11:55 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkDownTimeCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String downTimeCode) { |
|
|
public Map<String, Object> checkDownTimeCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String downTimeCode) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -892,9 +896,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用存储过程创建停机的记录 |
|
|
* TODO 调用存储过程创建停机的记录 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/27 17:26 |
|
|
* @date 2021/12/27 17:26 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void reportDownTime(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String downTimeCode, String username, String operateTime, Float totalTime) { |
|
|
public void reportDownTime(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String downTimeCode, String username, String operateTime, Float totalTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -936,9 +941,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 校验不良代码 |
|
|
* TODO 校验不良代码 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/28 14:40 |
|
|
* @date 2021/12/28 14:40 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkDefectCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String defectCode) { |
|
|
public Map<String, Object> checkDefectCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String defectCode) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -975,9 +981,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 执行报告不良代码的存储过程 |
|
|
* TODO 执行报告不良代码的存储过程 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/28 16:56 |
|
|
* @date 2021/12/28 16:56 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void reportDefectCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String defectCode, Float defectQty, |
|
|
public void reportDefectCode(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String defectCode, Float defectQty, |
|
|
String username, String reportDate) { |
|
|
String username, String reportDate) { |
|
|
@ -1026,9 +1033,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 检查是否处于上工具的时机 |
|
|
* TODO 检查是否处于上工具的时机 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/28 18:54 |
|
|
* @date 2021/12/28 18:54 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkProcessToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) { |
|
|
public Map<String, Object> checkProcessToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1044,9 +1052,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 检查工具实例的编码 |
|
|
* TODO 检查工具实例的编码 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/28 18:44 |
|
|
* @date 2021/12/28 18:44 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String toolInstanceId) { |
|
|
public Map<String, Object> checkToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String toolInstanceId) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1082,9 +1091,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用存储过程生成工具的记录的数据 |
|
|
* TODO 调用存储过程生成工具的记录的数据 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/29 18:37 |
|
|
* @date 2021/12/29 18:37 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void addToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String toolInstanceId, |
|
|
public void addToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String toolInstanceId, |
|
|
String username, String currentTime) { |
|
|
String username, String currentTime) { |
|
|
@ -1152,11 +1162,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return java.lang.String |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 判断是否处于调机或者停机--上/换材料 |
|
|
* @Description 判断是否处于调机或者停机--上/换材料 |
|
|
* @DateTime 2021/12/21 18:32 |
|
|
* @DateTime 2021/12/21 18:32 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, currentTime] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, currentTime] |
|
|
* @return java.lang.String |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public String checkProcessMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) { |
|
|
public String checkProcessMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1176,9 +1186,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用检查的是否可以上料的存储过程 |
|
|
* TODO 调用检查的是否可以上料的存储过程 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/22 13:49 |
|
|
* @date 2021/12/22 13:49 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkFeedingMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo) { |
|
|
public Map<String, Object> checkFeedingMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1218,9 +1229,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用存储过程执行上机的过程 |
|
|
* TODO 调用存储过程执行上机的过程 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/30 14:03 |
|
|
* @date 2021/12/30 14:03 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void feedingMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo, String username, String currentTime) { |
|
|
public void feedingMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo, String username, String currentTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1277,9 +1289,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 检查材料是否可以开始生产 |
|
|
* TODO 检查材料是否可以开始生产 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/31 11:28 |
|
|
* @date 2021/12/31 11:28 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkCompleteMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
public Map<String, Object> checkCompleteMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1296,9 +1309,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 检查工具是否可以开始生产 |
|
|
* TODO 检查工具是否可以开始生产 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/31 11:30 |
|
|
* @date 2021/12/31 11:30 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkCompleteToolId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
public Map<String, Object> checkCompleteToolId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1315,9 +1329,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO是否可以开始生产 |
|
|
* TODO是否可以开始生产 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/31 13:18 |
|
|
* @date 2021/12/31 13:18 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkStartProduce(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
public Map<String, Object> checkStartProduce(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1353,9 +1368,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用存储过程执行开始生产 |
|
|
* TODO 调用存储过程执行开始生产 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2022/1/6 17:29 |
|
|
* @date 2022/1/6 17:29 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void startProduce(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String operateTime) { |
|
|
public void startProduce(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String operateTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1443,9 +1459,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 添加注释 |
|
|
* TODO 添加注释 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2022/1/13 11:15 |
|
|
* @date 2022/1/13 11:15 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkEndTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) { |
|
|
public Map<String, Object> checkEndTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1463,9 +1480,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 执行结束调机的操作(针对单个材料的主材) |
|
|
* TODO 执行结束调机的操作(针对单个材料的主材) |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2022/1/13 11:33 |
|
|
* @date 2022/1/13 11:33 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void endTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, String rmPartNo, int histSeqNo, Float transQty, Float netIssueQty, |
|
|
public void endTuning(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, String rmPartNo, int histSeqNo, Float transQty, Float netIssueQty, |
|
|
String keyRMFlag, String sapBomItemNo, String startFromRollNo, String username, String currentTime) { |
|
|
String keyRMFlag, String sapBomItemNo, String startFromRollNo, String username, String currentTime) { |
|
|
@ -1535,9 +1553,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 是否可以切换刀具的存储过程 |
|
|
* TODO 是否可以切换刀具的存储过程 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2022/1/19 10:46 |
|
|
* @date 2022/1/19 10:46 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkConnectToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, |
|
|
public Map<String, Object> checkConnectToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, |
|
|
String oriToolInstanceId, String toolInstanceId, Integer histSeqNo) { |
|
|
String oriToolInstanceId, String toolInstanceId, Integer histSeqNo) { |
|
|
@ -1584,9 +1603,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 存储过程换刀 |
|
|
* TODO 存储过程换刀 |
|
|
|
|
|
* |
|
|
|
|
|
* @return void |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2022/1/19 15:14 |
|
|
* @date 2022/1/19 15:14 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void connectToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String oriToolInstanceId, String toolInstanceId, |
|
|
public void connectToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String oriToolInstanceId, String toolInstanceId, |
|
|
Integer histSeqNo, Float consumeQty, Float downTimeQty, String username, String currentTime) { |
|
|
Integer histSeqNo, Float consumeQty, Float downTimeQty, String username, String currentTime) { |
|
|
@ -1645,9 +1665,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* TODO 调用存储过程判断是否可以接换料功能 |
|
|
* TODO 调用存储过程判断是否可以接换料功能 |
|
|
|
|
|
* |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @author LR |
|
|
* @author LR |
|
|
* @date 2021/12/22 15:39 |
|
|
* @date 2021/12/22 15:39 |
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkConnectMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo, Integer histSeqNo) { |
|
|
public Map<String, Object> checkConnectMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo, Integer histSeqNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1690,11 +1711,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程换料功能 |
|
|
* @Description 调用存储过程换料功能 |
|
|
* @DateTime 2022/1/20 11:47 |
|
|
* @DateTime 2022/1/20 11:47 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, rmRollNo, bomItemNo, histSeqNo, downTimeQty, username, currentTime] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, rmRollNo, bomItemNo, histSeqNo, downTimeQty, username, currentTime] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void connectMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo, Integer histSeqNo, |
|
|
public void connectMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String rmRollNo, Integer bomItemNo, Integer histSeqNo, |
|
|
Float downTimeQty, String username, String currentTime) { |
|
|
Float downTimeQty, String username, String currentTime) { |
|
|
@ -1823,11 +1844,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 存储过程校验 单个材料的校验数据 |
|
|
* @Description 存储过程校验 单个材料的校验数据 |
|
|
* @DateTime 2022/1/25 15:05 |
|
|
* @DateTime 2022/1/25 15:05 |
|
|
* @Param [site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo] |
|
|
* @Param [site, orderNo, itemNo, rollNo, seqNo, editTotalReportQty, otherRollQty, editNewRollQty, netIssueQty, histSeqNo] |
|
|
* @return java.util.Map<java.lang.String,java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkFinishRollWithSfdcMaterialHist(String site, String orderNo, Integer itemNo, String rollNo, String seqNo, Float editTotalReportQty, Float otherRollQty, |
|
|
public Map<String, Object> checkFinishRollWithSfdcMaterialHist(String site, String orderNo, Integer itemNo, String rollNo, String seqNo, Float editTotalReportQty, Float otherRollQty, |
|
|
Float editNewRollQty, Float netIssueQty, Integer histSeqNo, String username) { |
|
|
Float editNewRollQty, Float netIssueQty, Integer histSeqNo, String username) { |
|
|
@ -1850,11 +1871,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 校验工单 派工单 上机卷 信息是否符合条件 |
|
|
* @Description 调用存储过程 校验工单 派工单 上机卷 信息是否符合条件 |
|
|
* @DateTime 2022/1/25 13:44 |
|
|
* @DateTime 2022/1/25 13:44 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo] |
|
|
* @return java.util.Map<java.lang.String,java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkFinishRollWithScheduleOpsShift(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String scheduledDate, String shiftDesc) { |
|
|
public Map<String, Object> checkFinishRollWithScheduleOpsShift(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String scheduledDate, String shiftDesc) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1872,11 +1893,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description |
|
|
* @Description |
|
|
* @DateTime 2022/1/25 13:55 |
|
|
* @DateTime 2022/1/25 13:55 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo] |
|
|
* @return java.util.Map<java.lang.String,java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkFinishRollWithSfdcRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
public Map<String, Object> checkFinishRollWithSfdcRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1892,11 +1913,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return java.util.Map<java.lang.String, java.lang.Object> |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 校验不同工序间数量大小 |
|
|
* @Description 调用存储过程 校验不同工序间数量大小 |
|
|
* @DateTime 2022/1/25 14:13 |
|
|
* @DateTime 2022/1/25 14:13 |
|
|
* @Param [site, orderNo, itemNo, editReportQty] |
|
|
* @Param [site, orderNo, itemNo, editReportQty] |
|
|
* @return java.util.Map<java.lang.String,java.lang.Object> |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public Map<String, Object> checkFinishRollWithSoRoutingQty(String site, String orderNo, Integer itemNo, Float editReportQty) { |
|
|
public Map<String, Object> checkFinishRollWithSoRoutingQty(String site, String orderNo, Integer itemNo, Float editReportQty) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1974,11 +1995,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 处理异常信息 |
|
|
* @Description 调用存储过程 处理异常信息 |
|
|
* @DateTime 2022/1/26 14:00 |
|
|
* @DateTime 2022/1/26 14:00 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, exceptionReason] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, exceptionReason] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessException(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String exceptionReason, String username) { |
|
|
public void finishRollProcessException(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String exceptionReason, String username) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -1994,10 +2015,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 处理Sfdc和派工单 |
|
|
* @Description 处理Sfdc和派工单 |
|
|
* @DateTime 2022/1/25 17:50 |
|
|
* @DateTime 2022/1/25 17:50 |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessSfdcAndSchedule(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float sfdcReportedQty, Float sfdcApproveQty, |
|
|
public void finishRollProcessSfdcAndSchedule(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float sfdcReportedQty, Float sfdcApproveQty, |
|
|
Float sfdcSetupTime, Float sfdcProdTime, Float sfdcDownTime, String eventTime, String tillTime, String remark, |
|
|
Float sfdcSetupTime, Float sfdcProdTime, Float sfdcDownTime, String eventTime, String tillTime, String remark, |
|
|
@ -2028,11 +2049,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 处理SfdcRoll和SfdcRoollOps |
|
|
* @Description 调用存储过程 处理SfdcRoll和SfdcRoollOps |
|
|
* @DateTime 2022/1/25 16:53 |
|
|
* @DateTime 2022/1/25 16:53 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, totalApprovedQty, sfdcApproveQty, defectedQty] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, totalApprovedQty, sfdcApproveQty, defectedQty] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessSfdcRollAndOps(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, |
|
|
public void finishRollProcessSfdcRollAndOps(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, |
|
|
Float totalApprovedQty, Float sfdcApproveQty, Float defectedQty, String username, String reportedTime) { |
|
|
Float totalApprovedQty, Float sfdcApproveQty, Float defectedQty, String username, String reportedTime) { |
|
|
@ -2052,11 +2073,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 处理SfdcMaterialHist的信息 --非主材 |
|
|
* @Description 调用存储过程 处理SfdcMaterialHist的信息 --非主材 |
|
|
* @DateTime 2022/1/25 15:39 |
|
|
* @DateTime 2022/1/25 15:39 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, username, reportedTime] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, username, reportedTime] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessSfdcMaterialHistWithNotKeyRm(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String reportedTime) { |
|
|
public void finishRollProcessSfdcMaterialHistWithNotKeyRm(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String reportedTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -2072,11 +2093,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 处理SfdcMaterialHist的信息 --主材 一次处理一个 |
|
|
* @Description 处理SfdcMaterialHist的信息 --主材 一次处理一个 |
|
|
* @DateTime 2022/1/25 15:36 |
|
|
* @DateTime 2022/1/25 15:36 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, netIssueQty, histSeqNo, username, reportedTime] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, netIssueQty, histSeqNo, username, reportedTime] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessSfdcMaterialHistWithKeyRm(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float netIssueQty, Integer histSeqNo, String username, String reportedTime) { |
|
|
public void finishRollProcessSfdcMaterialHistWithKeyRm(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float netIssueQty, Integer histSeqNo, String username, String reportedTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -2094,11 +2115,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 处理SfdcToolHist的信息 |
|
|
* @Description 调用存储过程 处理SfdcToolHist的信息 |
|
|
* @DateTime 2022/1/25 15:31 |
|
|
* @DateTime 2022/1/25 15:31 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, editTotalReportQty, username, reportedTime] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, editTotalReportQty, username, reportedTime] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessSfdcToolHist(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float editTotalReportQty, String username, String reportedTime) { |
|
|
public void finishRollProcessSfdcToolHist(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, Float editTotalReportQty, String username, String reportedTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
@ -2115,11 +2136,11 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
|
|
* @return void |
|
|
* @Author LR |
|
|
* @Author LR |
|
|
* @Description 调用存储过程 处理sfdcTime的信息 |
|
|
* @Description 调用存储过程 处理sfdcTime的信息 |
|
|
* @DateTime 2022/1/25 15:24 |
|
|
* @DateTime 2022/1/25 15:24 |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, username, reportedTime] |
|
|
* @Param [site, orderNo, itemNo, seqNo, rollNo, username, reportedTime] |
|
|
* @return void |
|
|
|
|
|
**/ |
|
|
**/ |
|
|
public void finishRollProcessSfdcTimeHist(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String reportedTime) { |
|
|
public void finishRollProcessSfdcTimeHist(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username, String reportedTime) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
|