fix(wms): 修复钢卷更新时二维码步骤类型检查逻辑
- 在非退火步骤类型时才进行独占状态检查 - 添加对qrcodeStepType为空的边界情况处理 - 修复二维码内容更新中的空指针检查逻辑
This commit is contained in:
@@ -1325,8 +1325,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
* @return 新钢卷ID字符串
|
||||
*/
|
||||
private String updateBySingle(WmsMaterialCoilBo bo, String qrcodeStepType) {
|
||||
// 检查独占状态
|
||||
validateCoilOperationPermission(bo.getCoilId(), "单个更新");
|
||||
if (StringUtils.isNotBlank(qrcodeStepType) && !"annealing".equals(qrcodeStepType)){
|
||||
// 检查独占状态
|
||||
validateCoilOperationPermission(bo.getCoilId(), "单个更新");
|
||||
}
|
||||
|
||||
// 查询原钢卷
|
||||
WmsMaterialCoil oldCoil = baseMapper.selectById(bo.getCoilId());
|
||||
@@ -1388,7 +1390,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
||||
|
||||
// 3. 更新二维码内容(添加更新步骤并更新current_coil_id)
|
||||
if (oldCoil.getQrcodeRecordId() != null) {
|
||||
if ("annealing".equals(qrcodeStepType)) {
|
||||
if (StringUtils.isNotBlank(qrcodeStepType) && "annealing".equals(qrcodeStepType)) {
|
||||
updateQrcodeContentForCustomStep(oldCoil, bo, newCoil.getCoilId(), "退火", "退火操作");
|
||||
} else {
|
||||
updateQrcodeContentForNormalUpdate(oldCoil, bo, newCoil.getCoilId());
|
||||
|
||||
Reference in New Issue
Block a user