diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java index 41c8fd9e..e1a10a85 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/PurchaseInputMapper.java @@ -10,32 +10,113 @@ import java.math.BigDecimal; import java.util.List; +/** + * @author bns + */ @Mapper public interface PurchaseInputMapper { + /** + * 查询 + * + * @param bean 查询条件 + * @return 结果 + */ List selectPutInListList(PurchaseCheckInfo bean); + /** + * 查询 + * + * @param taskId 查询条件 + * @return 结果 + */ String selectTypeNameByTaskId(Long taskId); + /** + * 查询 + * + * @param purchaseMacodeInfo 查询条件 + * @return 结果 + */ List selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo); + /** + * 修改 + * + * @param maMachine + * @return 结果 + */ int updateMaMachine(MaMachine maMachine); + /** + * 查询 + * + * @param typeId 查询条件 + * @return 结果 + */ MaType selectTypeByTypeId(Long typeId); + /** + * 修改 + * + * @param maType + * @return 结果 + */ int updateTypeByTypeId(MaType maType); + /** + * 查询 + * @param taskId 查询条件 + * @param typeId 查询条件 + * @return 结果 + */ BigDecimal selectInputNUmByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId); + /** + * 修改 + * + * @param purchaseCheckDetails + * @return 结果 + */ int updateByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails); + /** + * 新增 + * + * @param applyDetails + * @return 结果 + */ int insertInputApplyDetails(InputApplyDetails applyDetails); + /** + * 修改 + * + * @param purchaseMacodeInfo + * @return 结果 + */ int updateMacodeByType(PurchaseMacodeInfo purchaseMacodeInfo); + /** + * 新增 + * + * @param maInputRecord + * @return 结果 + */ int insertMaInputRecord(MaInputRecord maInputRecord); + /** + * 查询 + * + * @param taskId 查询条件 + * @return 结果 + */ Integer selectMacodeInfoStatusByTaskId(Long taskId); + /** + * 修改 + * + * @param task + * @return 结果 + */ int updateTmTask(TmTask task); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/PurchaseInputService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/PurchaseInputService.java index 97d1b4ae..b3983809 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/PurchaseInputService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/PurchaseInputService.java @@ -7,17 +7,32 @@ import com.bonus.sgzb.app.domain.PurchaseMacodeInfo; import java.util.List; +/** + * @author bns + */ public interface PurchaseInputService { /** - * 列表 + * 新购入库列表 + * + * @param bean 查询条件 + * @return AjaxResult对象 */ List getList(PurchaseCheckInfo bean); /** * 详情 + * + * @param purchaseMacodeInfo + * @return 详细信息列表 */ List selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo); + /** + * 修改管理状态 + * + * @param maInputVO + * @return 修改结果 + */ int modifyManageStatus(MaInputVO maInputVO); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java index 8c00843f..1d3151c3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/PurchaseInputServiceImpl.java @@ -15,6 +15,9 @@ import java.util.Date; import java.util.List; +/** + * @author bns + */ @Service public class PurchaseInputServiceImpl implements PurchaseInputService { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java index 396bcbc9..8b4cd8d2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java @@ -93,9 +93,11 @@ public interface IPurchaseCheckInfoService List putInExportList(PurchaseCheckInfo purchaseCheckInfo); /** - * - * @param - * @return - */ + * 获取新购验收任务--验收单 + * + * @param taskId + * @param keyWord + * @return + */ PurchaseCheckInfo getAcceptanceForm(Long taskId, String keyWord); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml index ad398166..87b917b8 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml @@ -376,6 +376,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN ppd.`status` = 1 THEN '已验收' WHEN ppd.`status` = 2 THEN '验收不通过' WHEN ppd.`status` = 3 THEN '已入库' + WHEN ppd.`status` = 4 THEN '入库不通过' ELSE '' END AS purchasingStatus FROM @@ -410,6 +411,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHEN ppd.`status` = 1 THEN '待入库' WHEN ppd.`status` = 2 THEN '验收不通过' WHEN ppd.`status` = 3 THEN '已入库' + WHEN ppd.`status` = 4 THEN '入库不通过' ELSE '' END AS statusResult FROM