修改下载附件后缀问题
This commit is contained in:
@@ -161,4 +161,11 @@ public class SysOaWarehouseMasterController extends BaseController {
|
|||||||
return toAjax(iSysOaWarehouseMasterService.redoMaster(masterId));
|
return toAjax(iSysOaWarehouseMasterService.redoMaster(masterId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单独修改remark
|
||||||
|
*/
|
||||||
|
@PutMapping("/updateRemark")
|
||||||
|
public R<Void> updateRemark(@RequestParam Long masterId, @RequestParam String remark) {
|
||||||
|
return toAjax(iSysOaWarehouseMasterService.updateRemark(masterId, remark));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,14 +144,6 @@ public class SysOaWarehouseTaskController extends BaseController {
|
|||||||
return toAjax(1);
|
return toAjax(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 单独修改remark
|
|
||||||
*/
|
|
||||||
@PutMapping("/updateRemark")
|
|
||||||
public R<Void> updateRemark(@RequestParam Long taskId, @RequestParam String remark) {
|
|
||||||
return toAjax(iSysOaWarehouseTaskService.updateRemark(taskId, remark));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除采购计划
|
* 删除采购计划
|
||||||
|
|||||||
@@ -83,4 +83,8 @@ public interface ISysOaWarehouseMasterService {
|
|||||||
*/
|
*/
|
||||||
boolean updateIsLike(Long masterId, Integer isLike);
|
boolean updateIsLike(Long masterId, Integer isLike);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单独修改remark
|
||||||
|
*/
|
||||||
|
Boolean updateRemark(Long masterId, String remark);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,9 +61,6 @@ public interface ISysOaWarehouseTaskService {
|
|||||||
|
|
||||||
int updateToWare(SysOaWarehouseTaskBo bo);
|
int updateToWare(SysOaWarehouseTaskBo bo);
|
||||||
|
|
||||||
/**
|
|
||||||
* 单独修改remark
|
|
||||||
*/
|
|
||||||
Boolean updateRemark(Long taskId, String remark);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -309,4 +309,13 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
|
|||||||
.eq(SysOaWarehouseMaster::getMasterId, masterId)
|
.eq(SysOaWarehouseMaster::getMasterId, masterId)
|
||||||
) > 0;
|
) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean updateRemark(Long masterId, String remark) {
|
||||||
|
if (masterId == null) return false;
|
||||||
|
SysOaWarehouseMaster update = new SysOaWarehouseMaster();
|
||||||
|
update.setMasterId(masterId);
|
||||||
|
update.setRemark(remark);
|
||||||
|
return baseMapper.updateById(update) > 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -211,14 +211,7 @@ public class SysOaWarehouseTaskServiceImpl implements ISysOaWarehouseTaskService
|
|||||||
return baseMapper.updateById(task);
|
return baseMapper.updateById(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Boolean updateRemark(Long taskId, String remark) {
|
|
||||||
if (taskId == null) return false;
|
|
||||||
SysOaWarehouseTask update = new SysOaWarehouseTask();
|
|
||||||
update.setTaskId(taskId);
|
|
||||||
update.setRemark(remark);
|
|
||||||
return baseMapper.updateById(update) > 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int toWareOne(Long masterId, SysOaWarehouseTaskBo bo , SysOaWarehouseDetailBo sysOaWarehouseDetailBo) {
|
private int toWareOne(Long masterId, SysOaWarehouseTaskBo bo , SysOaWarehouseDetailBo sysOaWarehouseDetailBo) {
|
||||||
// 进行入库操作 (因为存在一种情况是此为全新物料是没有物料id的)
|
// 进行入库操作 (因为存在一种情况是此为全新物料是没有物料id的)
|
||||||
|
|||||||
Reference in New Issue
Block a user