root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
zhangzq
2025-05-01 18:16:49 +08:00
parent e5a9148415 e9e706836b
commit 20aa17af2d
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/papervehicle/service/impl/MdPbPapervehicleServiceImpl.java
View File

@@ -68,7 +68,8 @@ public class MdPbPapervehicleServiceImpl extends ServiceImpl<MdPbPapervehicleMap
entity.setUpdate_optname(nickName);
entity.setUpdate_time(now);
mdPbPapervehicleMapper.updateById(entity);
int updateFlag = mdPbPapervehicleMapper.updateById(entity);
log.warn("mdPbPapervehicleMapper更新结果：" +updateFlag);
}
@Override

26
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -876,6 +876,8 @@ public class SlitterServiceImpl implements SlitterService {
return null;
}
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject acsToReduceTube(JSONObject param) {
log.info("扣除纸管数据的输入参数为：{}", param);
JSONObject res = new JSONObject();
@@ -904,20 +906,22 @@ public class SlitterServiceImpl implements SlitterService {
.eq(MdPbPapervehicle::getRow_num, param.getString("row_num")));
if (ObjectUtil.isEmpty(mdPbPapervehicle)) {
log.warn("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
return res;
throw new BadRequestException("托盘：" + vehicleCode + "第" + param.getString("row_num") + "行没数据！");
}
log.debug("更新前：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle);
if (mdPbPapervehicle != null || mdPbPapervehicle.getQty().intValue() > 0) {
UpdateWrapper<MdPbPapervehicle> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("vehicle_code", vehicleCode)
.eq("row_num", param.getString("row_num"))
.setSql("qty=qty-1");
papervehicleService.update(updateWrapper);
//数量减一
mdPbPapervehicle.setQty(BigDecimal.valueOf(mdPbPapervehicle.getQty().intValue()-1));
log.debug("更新后：" + vehicleCode + "第" + param.getString("row_num") + mdPbPapervehicle);
// 检查更新后的 qty 是否为 0，然后删除相应的记录
QueryWrapper<MdPbPapervehicle> deleteWrapper = new QueryWrapper<>();
deleteWrapper.eq("vehicle_code", vehicleCode)
.eq("row_num", param.getString("row_num"))
.eq("qty", "0");
boolean remove = papervehicleService.remove(deleteWrapper);
if(mdPbPapervehicle.getQty().intValue() <= 0){
boolean remove = papervehicleService.removeById(mdPbPapervehicle);
log.debug("删除0结果：" + vehicleCode + ":" + remove);
}else{
papervehicleService.update(mdPbPapervehicle);
}
// todo: 如果qty=0，创建AGV送空任务，（新的task_type）、后期优化可以新增诺宝取货完成提前释放货位，任务状态变成071
// if (remove) { // hint: 错误
// // 证明删除成功，创建任务搬走