注释优化调整

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java

@@ -84,9 +84,6 @@ public class BackChangeServiceImpl implements BackChangeService {
 
     /**
      * 新增退库申请
-     *
-     * @param csDeviceVo
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -132,8 +129,7 @@ public class BackChangeServiceImpl implements BackChangeService {
                     String errorMsg = String.format("%s，已有在途单据，在途数量%s，本次申请数量%s", typeName, totalOccupyNumStr, applyNumStr);
 
                     // 记录日志：包含关键参数，便于问题排查
-                    log.warn("业务校验失败：{}，已使用数量={}，在途数量={}，本次申请数量={}",
+                    log.warn("业务校验失败：{}，已使用数量={}，在途数量={}，本次申请数量={}", errorMsg, usedNum, onWayNum, applyNum);
-                            errorMsg, usedNum, onWayNum, applyNum);
 
                     // 返回错误结果
                     return AjaxResult.error(errorMsg, AjaxResult.class);
@@ -224,8 +220,8 @@ public class BackChangeServiceImpl implements BackChangeService {
     /**
      * 生成申请编号
      *
-     * @param thisMonthMaxOrder
+     * @param thisMonthMaxOrder 本月最大序号
-     * @return
+     * @return String 任务编码（例如T20250201-0001）
      */
     private String genderTaskCode(int thisMonthMaxOrder) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -237,9 +233,6 @@ public class BackChangeServiceImpl implements BackChangeService {
 
     /**
      * 修改退库申请
-     *
-     * @param csDeviceVo
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -339,9 +332,6 @@ public class BackChangeServiceImpl implements BackChangeService {
 
     /**
      * 删除退料申请
-     *
-     * @param csDeviceInfo
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -366,9 +356,6 @@ public class BackChangeServiceImpl implements BackChangeService {
 
     /**
      * 获取退料申请详情
-     *
-     * @param dto
-     * @return
      */
     @Override
     public BackCsDeviceVo getDevDetailsById(BackCsDeviceDetails dto) {
@@ -411,26 +398,16 @@ public class BackChangeServiceImpl implements BackChangeService {
 
     /**
      * 获取退料申请列表
-     *
-     * @param dto
-     * @return
      */
     @Override
     public List<BackCsDeviceInfo> getList(BackCsDeviceInfo dto) {
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         Long userId = SecurityUtils.getLoginUser().getUserid();
-        // 管理员和省公司可查看所有数据
-//        if (userId != null && deptId != null
-//                && !userId.equals(ADMIN_ID)
-//                && !deptId.equals(PROVINCE_COMPANY_DEPT_ID)) {
-//            dto.setCompanyId(deptId);
-//        }
         if (ADMIN_ID.equals(userId)) {
-            dto.setCompanyId(1L);
+            dto.setCompanyId(null);
         } else {
             dto.setCompanyId(deptId);
         }
-
         return mapper.getList(dto);
     }
 
@@ -438,8 +415,7 @@ public class BackChangeServiceImpl implements BackChangeService {
      * 审核退库申请
      * 注意：此方法由审批回调内部调用，不应直接暴露给前端
      *
-     * @param backCsDeviceDetails
+     * @param backCsDeviceDetails 退料设备明细
-     * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/controller/DevChangeController.java

@@ -41,16 +41,6 @@ public class DevChangeController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 查询在库 的status =1
-     * status =0 出库
-     * status=4退役
-     * <p>
-     * 5 维修
-     *
-     * @param vo
-     * @return
-     */
     @ApiOperation(value = "查询工程下拉选集合")
     @PostMapping("/getProList")
     public AjaxResult list(@RequestBody JjProjectVo vo) {
@@ -58,7 +48,7 @@ public class DevChangeController extends BaseController {
         return AjaxResult.success(list);
     }
 
-    @ApiOperation(value = "查询工程下拉选集合")
+    @ApiOperation(value = "查询电压等级下拉选集合")
     @PostMapping("/getVoltageLevel")
     public AjaxResult getVoltageLevel(@RequestBody JjProjectVo vo) {
         List<Map<String, Object>> list = service.getVoltageLevel(vo);
@@ -108,7 +98,6 @@ public class DevChangeController extends BaseController {
         util.exportExcel(response, list, "设备流转台账");
     }
 
-
     @ApiOperation(value = "设备流转台账记录")
     @GetMapping("/getDevChangeList")
     public TableDataInfo getDevChangeList(CsDeviceChangeVo vo) {
@@ -121,7 +110,7 @@ public class DevChangeController extends BaseController {
     @PostMapping("/exportDetails")
     public void exportDetails(HttpServletResponse response, CsDeviceChangeDetailsVo vo) {
         List<DevChangeVo> list = service.getDevDetails(vo);
-        ExcelUtil<DevChangeVo> util = new ExcelUtil<DevChangeVo>(DevChangeVo.class);
+        ExcelUtil<DevChangeVo> util = new ExcelUtil<>(DevChangeVo.class);
         util.exportExcel(response, list, "导出设备流转台账详情");
     }
 
@@ -129,7 +118,7 @@ public class DevChangeController extends BaseController {
     @PostMapping("/exportDetailsRetire")
     public void exportDetailsRetire(HttpServletResponse response, CsDeviceChangeDetailsVo vo) {
         List<DevChangeVo> list = service.getDevDetails(vo);
-        ExcelUtil<DevChangeVo> util = new ExcelUtil<DevChangeVo>(DevChangeVo.class);
+        ExcelUtil<DevChangeVo> util = new ExcelUtil<>(DevChangeVo.class);
         util.exportExcel(response, list, "导出设备流转台账详情");
     }
 
@@ -138,7 +127,7 @@ public class DevChangeController extends BaseController {
     @PostMapping("/exportDetailsRepair")
     public void exportDetailsRepair(HttpServletResponse response, CsDeviceChangeDetailsVo vo) {
         List<DevChangeVo> list = service.getDevDetails(vo);
-        ExcelUtil<DevChangeVo> util = new ExcelUtil<DevChangeVo>(DevChangeVo.class);
+        ExcelUtil<DevChangeVo> util = new ExcelUtil<>(DevChangeVo.class);
         util.exportExcel(response, list, "导出设备流转台账详情");
     }
 
@@ -150,9 +139,6 @@ public class DevChangeController extends BaseController {
 
     /**
      * 获取添加设备详情
-     *
-     * @param dto
-     * @return
      */
     @ApiOperation(value = "获取添加设备详情")
     @GetMapping("/getDevDetailsInfo")
@@ -169,9 +155,6 @@ public class DevChangeController extends BaseController {
 
     /**
      * 新增出库申请
-     *
-     * @param csDeviceVo
-     * @return
      */
     @ApiOperation(value = "新增出库申请")
     @PostMapping("/addDevDetails")
@@ -181,9 +164,6 @@ public class DevChangeController extends BaseController {
 
     /**
      * 修改出库申请
-     *
-     * @param csDeviceVo
-     * @return
      */
     @ApiOperation(value = "修改出库申请")
     @PostMapping("/updateDevDetails")
@@ -193,9 +173,6 @@ public class DevChangeController extends BaseController {
 
     /**
      * 删除出库申请
-     *
-     * @param csDeviceInfo
-     * @return
      */
     @ApiOperation(value = "删除出库申请")
     @PostMapping("/deleteDevDetails")
@@ -206,7 +183,6 @@ public class DevChangeController extends BaseController {
     /**
      * 获取设备详情
      *
-     * @param dto
      * @return
      */
     @ApiOperation(value = "获取设备详情")

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java

@@ -737,14 +737,18 @@ public class DevChangeServiceImpl implements DevChangeService {
     }
 
     /**
-     * @param entity
+     * @param entity 出库信息
-     * @return
+     * @return 结果
      */
     @Override
     public AjaxResult orderOut(CsDeviceDetails entity) {
         try {
             //装备
             if (entity.getDevType().equals("1")) {
+                BigDecimal inStockNum = mapper.getMaNum(entity);
+                if (inStockNum.compareTo(BigDecimal.ZERO) <= 0) {
+                    return AjaxResult.error("当前装备非在库状态,无法出库！");
+                }
                 mapper.updateOrderZb(entity);
             } else {
                 BigDecimal toolNum = mapper.getToolNum(entity);
@@ -824,10 +828,6 @@ public class DevChangeServiceImpl implements DevChangeService {
         }
     }
 
-    /**
-     * @param entity
-     * @return
-     */
     @Override
     public AjaxResult orderOutCancel(CsDeviceDetails entity) {
         try {
@@ -839,10 +839,6 @@ public class DevChangeServiceImpl implements DevChangeService {
         }
     }
 
-    /**
-     * @param entity
-     * @return
-     */
     @Override
     public AjaxResult orderOutCancelAll(CsDeviceDetails entity) {
         try {
@@ -871,7 +867,7 @@ public class DevChangeServiceImpl implements DevChangeService {
 //            dto.setCompanyId(deptId);
 //        }
         if(ADMIN_ID.equals(userId)){
-            dto.setCompanyId(1L);
+            dto.setCompanyId(null);
         }else{
             dto.setCompanyId(deptId);
         }