Browse Source

2026-02-06

机台工作台增加【暂停生产】【继续生产】
master
fengyuan_yang 4 months ago
parent
commit
d321d72556
  1. 10
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  2. 7
      src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
  3. 6
      src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
  4. 19
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  5. 13
      src/main/resources/mapper/schedule/ScheduleMapper.xml

10
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@ -1707,6 +1707,16 @@ public class ScheduleController extends AbstractController {
return R.ok("操作成功,请刷新数据!");
}
/**
* 暂停生产/继续生产调用存储过程 UspUpdateProductionStatus更新 ParkFlag 并写入 SFDC_TimeHist
* @param inData site, orderNo, seqNo, itemNo, rollNo(无则传*), currentTime, operatorId, parkFlag(N=开始 Y=暂停)
*/
@PostMapping(value = "updateProductionStatus")
public R updateProductionStatus(@RequestBody SearchScheduleData inData) {
scheduleService.updateProductionStatus(inData);
return R.ok("操作成功,请刷新数据!");
}
/**
* @Author sxm
* @Description 确认生产已排料 / 取消生产已排料

7
src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@ -569,6 +569,13 @@ public interface ScheduleMapper {
**/
void pauseOrReopenProduceOrder(SearchScheduleData inData);
/**
* 调用存储过程 UspUpdateProductionStatus暂停/继续生产更新 ParkFlag 并写入 SFDC_TimeHist
* @param inData site, orderNo, seqNo, itemNo, rollNo(无则传*), currentTime, operatorId, parkFlag(N=开始 Y=暂停)
* @return 存储过程返回的 resultCoderesultMsg
*/
java.util.Map<String, Object> updateProductionStatus(SearchScheduleData inData);
/**
* @Author sxm
* @Description 确认/取消 生产订单已排料

6
src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@ -1005,6 +1005,12 @@ public interface ScheduleService {
**/
void pauseOrReopenProduceOrder(SearchScheduleData inData);
/**
* 调用存储过程 UspUpdateProductionStatus暂停/继续生产
* @param inData site, orderNo, seqNo, itemNo, rollNo, currentTime, operatorId, parkFlag
*/
void updateProductionStatus(SearchScheduleData inData);
/**
* @return
* @Author sxm

19
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@ -4529,6 +4529,25 @@ public class ScheduleServiceImpl implements ScheduleService {
scheduleMapper.pauseOrReopenProduceOrder(inData);
}
@Override
public void updateProductionStatus(SearchScheduleData inData) {
if (inData.getCurrentTime() == null || inData.getCurrentTime().isEmpty()) {
inData.setCurrentTime(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
}
if (inData.getRollNo() == null || inData.getRollNo().isEmpty()) {
inData.setRollNo("*");
}
Map<String, Object> resultMap = scheduleMapper.updateProductionStatus(inData);
if (resultMap == null) {
return;
}
String resultCode = String.valueOf(resultMap.get("resultCode"));
if ("400".equalsIgnoreCase(resultCode)) {
String msg = String.valueOf(resultMap.get("resultMsg"));
throw new XJException(msg != null && !"null".equals(msg) ? msg : "操作失败");
}
}
@Override
@Transactional
public void costRollUpProduceOrder(SearchScheduleData inData) {

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

@ -2053,4 +2053,17 @@
#{userId}
</select>
<!-- 调用存储过程 UspUpdateProductionStatus:暂停生产/继续生产(写入 SFDC_TimeHist 并更新 ParkFlag) -->
<select id="updateProductionStatus" resultType="java.util.Map">
exec dbo.UspUpdateProductionStatus
#{site},
#{orderNo},
#{seqNo},
#{itemNo},
#{rollNo},
#{currentTime},
#{operatorId},
#{parkFlag}
</select>
</mapper>
Loading…
Cancel
Save