fix: 手持创建到内包间任务判断气胀轴不能为空

This commit is contained in:
2024-08-06 17:39:16 +08:00
parent ae53e7e1bd
commit b6ed2f6308

View File

@@ -1005,6 +1005,9 @@ public class SlitterServiceImpl implements SlitterService {
// 如果是没货
throw new BadRequestException("点位:" + point.getPoint_code() + "检测空气胀轴,请确保下卷任务是否完毕后触发!");
}
if (ObjectUtil.isEmpty(point.getQzz_no1()) || ObjectUtil.isEmpty(point.getQzz_no2())) {
throw new BadRequestException("点位:" + point.getPoint_code() + " 的气胀轴编码为空!");
}
List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
"1", "0", "2");
if (areaEmptyNotTaskPoint.size() == 0) {
@@ -1197,6 +1200,7 @@ public class SlitterServiceImpl implements SlitterService {
@Override
public JSONObject toShaftBinding(JSONObject param) {
log.info("气胀轴绑定:{}", param);
// param : container_name, point_code
String containerName = param.getString("container_name");
String pointCode1 = param.getString("point_code");
@@ -1280,6 +1284,7 @@ public class SlitterServiceImpl implements SlitterService {
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject bindSlitterSubVolumeInfo(JSONObject param) {
log.info("绑定分切机上的子卷信息:{}", param);
// param: point_code, container_name逗号隔开
// 子卷生成气胀轴编码设置05状态
String containerName = param.getString("container_name");
@@ -1324,6 +1329,7 @@ public class SlitterServiceImpl implements SlitterService {
@Override
public JSONObject unBindSlitterSubVolumeInfo(JSONObject param) {
log.info("解绑分切机上的子卷信息:{}", param);
String pointCode1 = param.getString("point_code");
StIvtCutpointivt slitterDevice = cutpointivtService.getPintByUpOrDownCode(pointCode1, false);
if (pointCode1.equals(slitterDevice.getUp_point_code())) {