diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 0030f8c7..6fb9ff24 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -47,7 +47,7 @@ import javax.servlet.http.HttpServletResponse; /** * 领料任务Service业务层处理 - * + * * @author xsheng * @date 2024-10-16 */ @@ -169,7 +169,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { /** * 查询领料任务列表 - * + * * @param leaseApplyInfo 领料任务 * @return 领料任务 */ @@ -398,7 +398,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } return count; }*/ - + /** * 发布任务 * @@ -511,7 +511,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { /** * 修改领料任务 - * + * * @param leaseApplyRequestVo 领料任务 * @return 结果 */ @@ -644,7 +644,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { /** * 批量删除领料任务 - * + * * @param ids 需要删除的领料任务主键 * @return 结果 */ @@ -655,7 +655,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { /** * 删除领料任务信息 - * + * * @param id 领料任务主键 * @return 结果 */ @@ -690,6 +690,8 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { recordList = recordList.stream().filter(item -> item.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString())).collect(Collectors.toList()); if (recordList.size() > 0) { msg = "监测到" + bmQrcodeInfo.getQrCode() + "符合出库条件,请确认是否出库!"; + }else{ + msg = "监测到" + bmQrcodeInfo.getQrCode() + "编码不符合出库条件,请检查后重新提交!"; } } else { msg = "监测到" + bmQrcodeInfo.getQrCode() + "编码不符合出库条件,请检查后重新提交!"; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java index 156325cf..64dfe90f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseCheckInfoController.java @@ -30,7 +30,7 @@ import static com.bonus.common.core.web.page.TableSupport.PAGE_SIZE; /** * 新购验收任务Controller - * + * * @author syruan */ @Api(tags = "新购管理接口") @@ -65,6 +65,16 @@ public class PurchaseCheckInfoController extends BaseController { return success(purchaseCheckInfoService.selectPurchaseCheckInfoById(purchaseQueryDto)); } + /** + * 获取新购验收人信息 + */ + @ApiOperation("获取新购验收人信息") + //@RequiresPermissions("purchase:info:query") + @GetMapping(value = "/getCheckUserList") + public AjaxResult getCheckUserList(@NotNull(message = "请求对象不能为空") PurchaseQueryDto purchaseQueryDto) { + return success(purchaseCheckInfoService.selectPurchaseCheckUserById(purchaseQueryDto)); + } + /** * 新增新购验收任务 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index fcf79e39..c401b5bd 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -136,4 +136,14 @@ public class PurchaseCheckInfo extends BaseEntity { @ApiModelProperty(value = "新购模块阶段名称") private String modelName; + + private String checkUser; + + public String getCheckUser() { + return checkUser; + } + + public void setCheckUser(String checkUser) { + this.checkUser = checkUser; + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java index 024fa924..e707598c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckInfoMapper.java @@ -7,14 +7,14 @@ import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; /** * 新购验收任务Mapper接口 - * + * * @author xsheng * @date 2024-10-16 */ public interface PurchaseCheckInfoMapper { /** * 查询新购验收任务 - * + * * @param id 新购验收任务主键 * @return 新购验收任务 */ @@ -22,7 +22,7 @@ public interface PurchaseCheckInfoMapper { /** * 查询新购验收任务列表--单表基础查询 - * + * * @param purchaseCheckInfo 新购验收任务 * @return 新购验收任务集合 */ @@ -46,7 +46,7 @@ public interface PurchaseCheckInfoMapper { /** * 新增新购验收任务 - * + * * @param purchaseCheckInfo 新购验收任务 * @return 结果 */ @@ -54,7 +54,7 @@ public interface PurchaseCheckInfoMapper { /** * 修改新购验收任务 - * + * * @param purchaseCheckInfo 新购验收任务 * @return 结果 */ @@ -62,7 +62,7 @@ public interface PurchaseCheckInfoMapper { /** * 删除新购验收任务 - * + * * @param id 新购验收任务主键 * @return 结果 */ @@ -70,9 +70,11 @@ public interface PurchaseCheckInfoMapper { /** * 批量删除新购验收任务 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ int deletePurchaseCheckInfoByIds(Long[] ids); + + List selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java index 0a13514d..2dfa3067 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/IPurchaseCheckInfoService.java @@ -12,13 +12,13 @@ import com.bonus.material.purchase.domain.vo.PurchaseVerifyVo; /** * 新购验收任务Service接口 - * + * * @author syruan */ public interface IPurchaseCheckInfoService { /** * 查询新购验收任务 - * + * * @param purchaseQueryDto 新购验收请求条件封装dto * @return 新购验收任务 */ @@ -26,7 +26,7 @@ public interface IPurchaseCheckInfoService { /** * 查询新购验收任务列表 - * + * * @param purchaseQueryDto 新购验收任务 * @return 新购验收任务集合 */ @@ -36,7 +36,7 @@ public interface IPurchaseCheckInfoService { /** * 新增新购验收任务 - * + * * @param purchaseCheckDto 新购验收任务dto * @return 结果 */ @@ -60,7 +60,7 @@ public interface IPurchaseCheckInfoService { /** * 修改新购验收任务 - * + * * @param purchaseCheckDto 新购验收任务 * @return 结果 */ @@ -68,7 +68,7 @@ public interface IPurchaseCheckInfoService { /** * 批量删除新购验收任务 - * + * * @param ids 需要删除的新购验收任务主键集合 * @return 结果 */ @@ -76,9 +76,11 @@ public interface IPurchaseCheckInfoService { /** * 删除新购验收任务信息 - * + * * @param id 新购验收任务主键 * @return 结果 */ int deletePurchaseCheckInfoById(Long id); + + List selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 5f82674d..2b799e20 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -688,4 +688,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { public int deletePurchaseCheckInfoById(Long id) { return purchaseCheckInfoMapper.deletePurchaseCheckInfoById(id); } + + @Override + public List selectPurchaseCheckUserById(PurchaseQueryDto purchaseQueryDto) { + return purchaseCheckInfoMapper.selectPurchaseCheckUserById(purchaseQueryDto); + } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml index 4f7ccafd..c72d3a2a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckInfoMapper.xml @@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into purchase_check_info @@ -123,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from purchase_check_info where id in + delete from purchase_check_info where id in #{id} @@ -152,4 +153,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pci.task_id = #{taskId} - \ No newline at end of file + + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml index da7b461b..b0814288 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementReduceMapper.xml @@ -33,10 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from slt_reduce_details - where apply_id = #{id}; - delete - from bm_file_info - where model_id = #{id} + where apply_id = #{id} +