diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java index 19bda6e..860a26b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java @@ -4,10 +4,7 @@ import java.util.Arrays; import java.util.List; import com.hxhq.business.dto.gyzj.ListDto; -import com.hxhq.business.form.gyzj.BjForm; -import com.hxhq.business.form.gyzj.CzyjForm; -import com.hxhq.business.form.gyzj.GhForm; -import com.hxhq.business.form.gyzj.SearchForm; +import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.IGyzjService; import com.hxhq.common.security.annotation.RequiresPermissions; import com.hxhq.common.security.utils.SecurityUtils; @@ -49,7 +46,7 @@ public class StudyGyzjController extends BaseController * 处置药剂 */ @PostMapping("/czyj") - @RequiresPermissions({"business:studyGyzj:xq","business:nonTrialGyzj:xq","business:drugGyzj:xq"}) + @RequiresPermissions({"business:studyGyzj:czyj","business:nonTrialGyzj:czyj","business:drugGyzj:czyj"}) public AjaxResult czyj(@RequestBody CzyjForm form) { form.setClrId(SecurityUtils.getUserId()); @@ -82,4 +79,17 @@ public class StudyGyzjController extends BaseController return AjaxResult.success("操作成功"); } + /** + * 修改库存 + */ + @PostMapping("xgkc") + @RequiresPermissions({"business:studyGyzj:xgkc","business:nonTrialGyzj:xgkc","business:drugGyzj:xgkc"}) + public AjaxResult xgkc(@RequestBody XgkcForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.xgkc(form); + return AjaxResult.success("操作成功"); + } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java index 013a053..29babc5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java @@ -12,12 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStudyGyzjService extends IService { - /** - * 查询试验-物资信息-给药制剂列表 - * - * @param studyGyzj 试验-物资信息-给药制剂 - * @return 试验-物资信息-给药制剂集合 - */ - public List queryList(StudyGyzj studyGyzj); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java index 413efff..678c284 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java @@ -12,12 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IStudyMjyService extends IService { - /** - * 查询试验-物资信息-麻精药列表 - * - * @param studyMjy 试验-物资信息-麻精药 - * @return 试验-物资信息-麻精药集合 - */ - public List queryList(StudyMjy studyMjy); - + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java index d54a584..d6625e9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java @@ -19,17 +19,5 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class StudyGyzjServiceImpl extends ServiceImpl implements IStudyGyzjService { - /** - * 查询试验-物资信息-给药制剂列表 - * - * @param studyGyzj 试验-物资信息-给药制剂 - * @return 试验-物资信息-给药制剂 - */ - @Override - public List queryList(StudyGyzj studyGyzj) - { - QueryWrapper queryWrapper = Wrappers.query(); - return this.list(queryWrapper); - } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java index 3a1c8bb..a84eb56 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java @@ -19,17 +19,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class StudyMjyServiceImpl extends ServiceImpl implements IStudyMjyService { - /** - * 查询试验-物资信息-麻精药列表 - * - * @param studyMjy 试验-物资信息-麻精药 - * @return 试验-物资信息-麻精药 - */ - @Override - public List queryList(StudyMjy studyMjy) - { - QueryWrapper queryWrapper = Wrappers.query(); - return this.list(queryWrapper); - } + }