代码规范修改

2024-01-30 17:16:19 +08:00 · 2024-01-30 17:16:19 +08:00 · 820e6dd77e
parent e920a9fd61
commit 820e6dd77e
7 changed files with 210 additions and 19 deletions
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java
@ -79,7 +79,7 @@ public interface PurchaseCheckInfoMapper
    int insertBmNoticeInfo(BmNoticeInfo bmNoticeInfo);

    /**
-     *
+     * 查询
     * @param purchaseCheckInfo
     * @return
     */
@ -87,11 +87,14 @@ public interface PurchaseCheckInfoMapper

    /**
     * 新购验收
+     * @param purchaseCheckInfo
+     * @return
     */
    List<PurchaseCheckInfo> exportList(PurchaseCheckInfo purchaseCheckInfo);
-
    /**
     * 新购入库导出
+     * @param purchaseCheckInfo
+     * @return
     */
    List<PurchaseInput> putInExportList(PurchaseCheckInfo purchaseCheckInfo);
 }
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
@ -70,48 +70,160 @@ public interface PurchaseMacodeInfoMapper {
     */
    public int deletePurchaseMacodeInfoByTaskIds(Long[] taskIds);

+    /**
+     * 查询
+     * @param typeId
+     * @return
+     */
    JSONObject getTypeByTypeId(long typeId);

+    /**
+     * 查询
+     * @param typeId
+     * @param nowDate
+     * @return
+     */
+
    int getSerialNumber(@Param("typeId") long typeId, @Param("nowDate") Date nowDate);

+    /**
+     * 查询
+     * @param typeId
+     * @return
+     */
    JSONObject getTypeNameByTypeId(Long typeId);

+    /**
+     * 删除
+     * @param id
+     * @return
+     */
    int deletePurchaseMacodeInfoById(Long id);

+    /**
+     * 查询
+     * @param fixCode
+     * @return
+     */
    MaMachine selectMachineByAssetsCode(String fixCode);

+    /**
+     * 增加机具
+     * @param maMachine
+     * @return
+     */
    int maMachineAdd(MaMachine maMachine);

+    /**
+     * 当全部为已入库的时候任务改为入库状态
+     * @param taskId
+     * @return
+     */
    Integer selectMacodeInfoStatusByTaskId(Long taskId);

+    /**
+     * 插入
+     * @param maInputRecord
+     * @return
+     */
    int insertMaInputRecord(MaInputRecord maInputRecord);

+    /**
+     * 查询
+     * @param typeId
+     * @return
+     */
    MaType selectTypeByTypeId(Long typeId);

+    /**
+     * 修改
+     * @param maType
+     * @return
+     */
    int updateTypeByTypeId(MaType maType);

+    /**
+     * 修改
+     * @param maMachine
+     * @return
+     */
    int updateMaMachine(MaMachine maMachine);

+    /**
+     * 查询
+     * @param codingRule
+     * @return
+     */
    int selectMachineByMaCode(String codingRule);

+    /**
+     * 根据机具编码删除编码
+     * @param maCode
+     * @return
+     */
    int deletePurchaseMacodeInfoByMaCode(String maCode);

+    /**
+     * 根据机具编码删除编码
+     * @param maCode
+     * @return
+     */
    int deleteMaMachineInfoByMaCode(String maCode);

+    /**
+     *根据类型id和任务id查询编码详情
+     * @param purchaseMacodeInfo
+     * @return
+     */
    List<PurchaseMacodeInfo> selectPurchaseMacodeInfo(PurchaseMacodeInfo purchaseMacodeInfo);

+    /**
+     * 获取入库清单明细
+     * @param purchaseMacodeInfo
+     * @return
+     */
    List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo);

+    /**
+     * 查询
+     * @param maCode
+     * @return
+     */
    int selectMaCode(String maCode);

+    /**
+     * 修改
+     * @param purchaseMacodeInfo
+     * @return
+     */
    int updateMacodeByType(PurchaseMacodeInfo purchaseMacodeInfo);

+    /**
+     * 查询
+     * @param nowDate
+     * @return
+     */
    int selectLableNumByMonth(Date nowDate);

+    /**
+     * 插入
+     * @param maMachineLabel
+     * @return
+     */
    int insertMaMachineLabel(MaMachineLabel maMachineLabel);

+    /**
+     * 插入
+     * @param maLabelBind
+     * @return
+     */
    int insertMaLabelBind(MaLabelBind maLabelBind);

+    /**
+     * 插入
+     * @param applyDetails
+     * @return
+     */
    int insertInputApplyDetails(InputApplyDetails applyDetails);

 }
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java
@ -65,23 +65,73 @@ public interface RepairAuditDetailsMapper
     */
    public int deleteRepairAuditDetailsByIds(Long[] ids);

+    /**
+     * 查询
+     * @param repairAuditDetails
+     * @return
+     */
    List<ScrapApplyDetailsVO> selectRepairQuestList(RepairAuditDetails repairAuditDetails);

+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
    List<RepairAuditDetails> selectRepairAuditDetailsByTaskId(Long taskId);

+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
    String selectTypeNameByTaskId(Long taskId);

+    /**
+     * 导出
+     * @param bean
+     * @return
+     */
    List<RepairAuditDetailsVO> exportRepairQuestList(RepairAuditDetails bean);

+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
    List<RepairAuditDetails> selectRepairInputByTaskId(Long taskId);

+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
    List<RepairAuditDetails> selectScrapNumByTaskId(Long taskId);

+    /**
+     * 修改
+     * @param bean
+     * @return
+     */
    int updateStatus(RepairAuditDetails bean);

+    /**
+     * 新增
+     * @param repairTaskDetails
+     * @return
+     */
    int insertRepairDetails(RepairTaskDetails repairTaskDetails);

+    /**
+     * 查询
+     * @param repairId
+     * @return
+     */
    Long getBackId(Long repairId);

+    /**
+     * 查询
+     * @param taskId
+     * @return
+     */
    List<RepairAuditDetails> selectnotAuditByTaskId(Long taskId);
 }
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairTestInputMapper.java
@ -15,100 +15,106 @@ import java.util.Map;
 public interface RepairTestInputMapper {

    /**
+     * 获取修试后入库列表
     * @param dto
     * @return List<RepairTestInputVo>
-     * @description 获取修试后入库列表
     * @author cwchen
     * @date 2023/12/16 16:05
     */
    List<RepairTestInputVo> getRepairedList(RepairTestInputDto dto);

    /**
+     * 获取修试后入库-详情列表
     * @param dto
     * @return List<RepairTestInputVo>
-     * @description 获取修试后入库-详情列表
     * @author cwchen
     * @date 2023/12/16 17:34
     */
    List<RepairTestInputDetailVo> getRepairedDetailList(RepairTestInputDto dto);

    /**
+     * 更新修试后入库-数据
     * @param dto
-     * @description 更新修试后入库-数据
     * @author cwchen
     * @date 2023/12/16 19:17
     */
    void updateRepairInputDetails(RepairTestWarehousingDto dto);

    /**
+     *  新增入库任务详细表-数据
     * @param dto
-     * @description 新增入库任务详细表-数据
     * @author cwchen
     * @date 2023/12/16 19:33
     */
    void addInputApplyDetails(RepairTestWarehousingDto dto);

    /**
+     * 查询机具类型-库存数量
     * @param typeId
     * @return Map<Object>
-     * @description 查询机具类型-库存数量
     * @author cwchen
     * @date 2023/12/16 20:24
     */
    Map<String, Object> getMaTypeByNum(String typeId);

    /**
+     * 更新机具类型-库存数量
     * @param typeId
     * @param num
-     * @description 更新机具类型-库存数量
     * @author cwchen
     * @date 2023/12/16 20:45
     */
    void updateMaTypeNum(@Param("typeId") String typeId, @Param("num") double num);

    /**
+     * 查询机具状态-在库的id
     * @param maStatus
     * @param status
     * @return int
-     * @description 查询机具状态-在库的id
     * @author cwchen
     * @date 2023/12/16 20:52
     */
    int getDicByMaStatusId(@Param("maStatus") String maStatus, @Param("status") String status);

    /**
+     * 管理方式为编号的需更新机具设备的机具状态
     * @param dicId
     * @param maId
-     * @description 管理方式为编号的需更新机具设备的机具状态
     * @author cwchen
     * @date 2023/12/16 20:59
     */
    void updateMaMachineStatus(@Param("dicId") int dicId, @Param("maId") String maId);

    /**
+     * 查询修试后入库的状态是否全部更新
     * @param dto
     * @return List<Integer>
-     * @description 查询修试后入库的状态是否全部更新
     * @author cwchen
     * @date 2023/12/16 21:03
     */
    Map<String, Object> getIsAllUpdate(RepairTestWarehousingDto dto);

    /**
+     *  更新任务表状态
     * @param dto
     * @param dicId
-     * @description 更新任务表状态
     * @author cwchen
     * @date 2023/12/16 21:19
     */
    void updateTmTaskStatus(@Param("params") RepairTestWarehousingDto dto, @Param("dictId") int dicId);

+    /**
+     * 插入
+     * @param repairTestWarehousingDto
+     * @return
+     */
    int insertRepairInputDetails(RepairInputDetails repairTestWarehousingDto);

    /**
+     * 修试入库--导出
+     *
    * @param bean
    * @return List<RepairTestInputDetailVo>
-    * @description 修试入库--导出
    * @author hay
    * @date 2024/1/9 15:14
    */
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java
@ -12,9 +12,18 @@ import java.util.List;
 */
@Mapper
 public interface ReturnOfMaterialsInfoMapper {
-
+    /**
+     * 查询
+     * @param bean
+     * @return
+     */
    List<ReturnOfMaterialsInfo> getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean);

+    /**
+     * 查询
+     * @param level
+     * @return
+     */
    List<ReturnOfMaterialsInfo> getTypeList(String level);

 }
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/RepairTestInputService.java
@ -13,36 +13,36 @@ import java.util.List;
 */
 public interface RepairTestInputService {
    /**
+     * 获取修试后入库列表
     * @param dto
     * @return List<RepairTestInputVo>
-     * @description 获取修试后入库列表
     * @author cwchen
     * @date 2023/12/16 16:03
     */
    List<RepairTestInputVo> getRepairedList(RepairTestInputDto dto);

    /**
+     * 获取修试后入库列表-详情
     * @param dto
     * @return List<RepairTestInputDetailVo>
-     * @description 获取修试后入库列表-详情
     * @author cwchen
     * @date 2023/12/16 17:33
     */
    List<RepairTestInputDetailVo> getRepairedDetailList(RepairTestInputDto dto);

    /**
+     *  修试后入库-入库操作
     * @param dto
     * @return AjaxResult
-     * @description 修试后入库-入库操作
     * @author cwchen
     * @date 2023/12/16 18:35
     */
    AjaxResult inputByType(RepairTestInputDto dto);

    /**
+     * 修试入库-导出
    * @param bean
    * @return List<RepairTestInputDetailVo>
-    * @description 修试入库-导出
    * @author hay
    * @date 2024/1/9 15:13
    */
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java
@ -9,13 +9,24 @@ import java.util.List;
 * @author lsun
 */
 public interface ReturnOfMaterialsInfoService {
-
+    /**
+     * 查询
+     * @param bean
+     * @return
+     */
    List<ReturnOfMaterialsInfo> getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean);

+    /**
+     * 查询
+     * @param level
+     * @return
+     */
    List<ReturnOfMaterialsInfo> getTypeList(String level);

    /**
     * 退料入库导出
+     * @param bean
+     * @return
     */
    List<ReturnOfMaterialsInfo> exportList(ReturnOfMaterialsInfo bean);
 }