Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X
This commit is contained in:
@@ -287,10 +287,18 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService {
|
||||
continue;
|
||||
}
|
||||
// 检查钢卷是否已被其他操作锁定(exclusiveStatus != 0)
|
||||
// exclusiveStatus=1: 分卷中, exclusiveStatus=2: 已在其他计划中
|
||||
WmsMaterialCoil coil = coilMap.get(coilId);
|
||||
if (coil != null && coil.getExclusiveStatus() != null && coil.getExclusiveStatus() != 0) {
|
||||
throw new ServiceException("钢卷" + coil.getEnterCoilNo() + "正在进行其他操作,无法绑定");
|
||||
String lockDesc;
|
||||
switch (coil.getExclusiveStatus()) {
|
||||
case 1: lockDesc = "已在单步分卷中"; break;
|
||||
case 2: lockDesc = "已在退火中"; break;
|
||||
case 3: lockDesc = "已被酸扎领料锁定"; break;
|
||||
case 4: lockDesc = "已被分卷领料锁定"; break;
|
||||
case 5: lockDesc = "已被合卷领料锁定"; break;
|
||||
default: lockDesc = "已被其他操作锁定(状态码:" + coil.getExclusiveStatus() + ")"; break;
|
||||
}
|
||||
throw new ServiceException("钢卷" + coil.getEnterCoilNo() + lockDesc + ",无法绑定");
|
||||
}
|
||||
WmsFurnacePlanCoil entity = new WmsFurnacePlanCoil();
|
||||
entity.setPlanId(bo.getPlanId());
|
||||
|
||||
Reference in New Issue
Block a user