ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BaseModel; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.ClinicOutboundGoodsDto; import com.ruoyi.system.dto.InventoryDto; @@ -192,6 +194,7 @@ @ApiOperation(value = "诊所 确认盘点") @PostMapping(value = "/inventoryGoods") @Log(title = "盘点管理-诊所确认盘点", businessType = BusinessType.UPDATE) public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) { SysUser user = tokenService.getLoginUser().getUser(); erpGoodsService.inventoryGoods1(dto,user); @@ -311,6 +314,7 @@ @ApiOperation(value = "诊所 入库商品操作") @PostMapping(value = "/warehouseGoods") @Log(title = "库存管理-诊所入库", businessType = BusinessType.INSERT) public R<?> warehouseGoods(@RequestBody @Valid WarehouseGoodsDto dto) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -396,6 +400,7 @@ @ApiOperation(value = "诊所 出库商品操作") @PostMapping(value = "/outboundGoods") @Log(title = "库存管理-诊所出库", businessType = BusinessType.UPDATE) public R<?> outboundGoods(@RequestBody @Valid ClinicOutboundGoodsDto dto) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.BaseModel; @@ -17,6 +18,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.WebUtils; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.*; @@ -179,6 +181,7 @@ */ @ApiOperation(value = "诊所 一键获取商品 获取全部") @PostMapping(value = "/getAllGoodsList") @Log(title = "商品管理-诊所 一键获取商品", businessType = BusinessType.INSERT) public R<?> getAllGoodsList() { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -222,6 +225,7 @@ @ApiOperation(value = "供应商添加商品") @PostMapping(value = "/add") @Log(title = "商品管理-供应商添加", businessType = BusinessType.INSERT) public R<Boolean> add(@Validated @RequestBody TErpGoodsAddDto dto) { SysUser user = tokenService.getLoginUser().getUser(); if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(),null)) { @@ -268,6 +272,7 @@ } @ApiOperation(value = "诊所添加商品") @PostMapping(value = "/clinicAdd") @Log(title = "商品管理-诊所添加", businessType = BusinessType.INSERT) public R<Boolean> clinicAdd(@Validated @RequestBody TErpClinicGoodsAddDto dto) { SysUser user = tokenService.getLoginUser().getUser(); if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(),null)) { @@ -305,6 +310,7 @@ @ApiOperation(value = "诊所编辑商品") @PostMapping(value = "/clinicUpdate") @Log(title = "商品管理-诊所编辑", businessType = BusinessType.UPDATE) public R<Boolean> clinicUpdate(@Validated @RequestBody TErpClinicGoodsUpdateDto dto) { SysUser user = tokenService.getLoginUser().getUser(); if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(),dto.getId())) { @@ -338,6 +344,7 @@ @ApiOperation(value = "供应商/诊所 删除商品") @DeleteMapping(value = "/delete/{id}") @Log(title = "商品管理-删除", businessType = BusinessType.DELETE) public R<Boolean> delete(@PathVariable String id) { TErpGoods goods = erpGoodsService.getById(id); SysUser user = tokenService.getLoginUser().getUser(); @@ -377,6 +384,7 @@ @ApiOperation(value = "诊所 一键添加商品") @PostMapping(value = "/addSupplierGoods") @Log(title = "商品管理-诊所一键添加商品", businessType = BusinessType.INSERT) public R<Boolean> addSupplierGoods(@RequestBody AddSupplierGoodsDto dto) { // List<String> split = Arrays.asList(goodsIds.split(",")); List<TErpGoods> list = erpGoodsService.list(new LambdaQueryWrapper<TErpGoods>().in(TErpGoods::getId, dto.getGoodsIds())); @@ -421,6 +429,7 @@ */ @ApiOperation(value = "供应商启用 停用商品") @PostMapping(value = "/updateStatus") @Log(title = "商品管理-供应商启用/停用商品", businessType = BusinessType.UPDATE) public R<Boolean> updateStatus(@RequestBody TErpGoodsUpdateStatusDto dto) { TErpGoods goods = erpGoodsService.getById(dto.getId()); if(dto.getState()==1 && goods.getTypeId()==null){ @@ -436,6 +445,7 @@ @ApiOperation(value = "供应商完善商品") @PostMapping(value = "/saveDataInfo") @Log(title = "商品管理-供应商完善商品", businessType = BusinessType.UPDATE) public R<Boolean> saveDataInfo(@RequestBody @Valid TErpGoodsInfoSaveDto dto) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -511,6 +521,7 @@ @ApiOperation(value = "商品管理信息导出--导出") @PostMapping("/export") @Log(title = "商品管理-导出", businessType = BusinessType.EXPORT) public void listExport(@RequestBody TErpGoodsQuery query) { SysUser user = tokenService.getLoginUser().getUser(); @@ -570,6 +581,7 @@ @ApiOperation(value = "商品管理信息导入") @PostMapping("/importFile") @Log(title = "商品管理-导入", businessType = BusinessType.IMPORT) public AjaxResult importFile(@RequestParam(value = "file") MultipartFile file ) { SysUser user = tokenService.getLoginUser().getUser(); @@ -760,6 +772,7 @@ @ApiOperation(value = "平台设置分佣") @PostMapping(value = "/setCommission") @Log(title = "商品管理-平台设置分佣", businessType = BusinessType.UPDATE) public R<Boolean> setCommission(@RequestBody @Valid TErpGoodsSetCommissionDto dto) { SysUser user = tokenService.getLoginUser().getUser(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
@@ -1,9 +1,11 @@ package com.ruoyi.web.controller.api; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.UpdateReminderDto; import com.ruoyi.system.model.TErpClinicWarehousingBatch; @@ -87,6 +89,7 @@ */ @ApiOperation(value = "erp保养提醒操作维护") @PostMapping(value = "/updateReminder") @Log(title = "保养提醒管理-操作维护", businessType = BusinessType.UPDATE) public R<?> updateReminder(@RequestBody @Valid UpdateReminderDto dto) { TErpMaintenanceReminder reminder = erpMaintenanceReminderService.getById(dto.getId()); reminder.setStatus(dto.getStatus()); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BaseModel; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.AddProcurementDto; @@ -155,6 +157,7 @@ @ApiOperation(value = "添加采购") @PostMapping(value = "/addProcurement") @Log(title = "采购管理-添加采购", businessType = BusinessType.INSERT) public R<String> addProcurement(@RequestBody @Valid List<AddProcurementDto> dtos) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -177,6 +180,7 @@ @ApiOperation(value = "删除采购") @DeleteMapping(value = "/delProcurement/{id}") @Log(title = "采购管理-删除采购", businessType = BusinessType.DELETE) public R<String> delProcurement(@PathVariable String id) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -231,6 +235,7 @@ @ApiOperation(value = "采购详情--发货(仓库角色)") @PostMapping(value = "/detailProcurementSend") @Log(title = "采购管理-发货", businessType = BusinessType.UPDATE) public R<?> detailProcurementSend(@RequestBody DetailProcurementSendDto dto) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -315,6 +320,7 @@ @ApiOperation(value = "采购详情入库") @PostMapping(value = "/updateStatusProcurement") @Log(title = "采购管理-入库", businessType = BusinessType.INSERT) @Transactional(rollbackFor = Exception.class) public R<DetailProcurementVO> updateStatusProcurement(@RequestBody @Valid UpdateStatusProcurementLastDto dto) { SysUser user = tokenService.getLoginUser().getUser(); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java
@@ -3,9 +3,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.InventoryDto; import com.ruoyi.system.dto.OutboundGoodsDto; @@ -117,6 +119,7 @@ @ApiOperation(value = "供应商库存入库") @PostMapping(value = "/warehousingGoods") @Log(title = "库存管理-入库", businessType = BusinessType.INSERT) public R<?> warehousingGoods(@RequestBody @Valid List<WarehousingGoodsDto> dtos) { SysUser user = tokenService.getLoginUser().getUser(); erpSupplierWarehousingService.warehousingGoods(dtos,user); @@ -125,6 +128,7 @@ @ApiOperation(value = "供应商库存出库") @PostMapping(value = "/outbountGoods") @Log(title = "库存管理-出库", businessType = BusinessType.UPDATE) public R<?> outbountGoods(@RequestBody @Valid OutboundGoodsDto dto) { SysUser user = tokenService.getLoginUser().getUser(); erpSupplierWarehousingService.outbountGoods(dto,user); @@ -178,6 +182,7 @@ @ApiOperation(value = "供应商 确认盘点") @PostMapping(value = "/inventoryGoods") @Log(title = "盘点管理-供应商确认盘点", businessType = BusinessType.UPDATE) public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) { SysUser user = tokenService.getLoginUser().getUser(); erpGoodsService.inventoryGoods(dto,user); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.collect.ImmutableMap; import com.lkl.laop.sdk.exception.SDKException; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.framework.web.service.TokenService; @@ -110,6 +112,7 @@ @ApiOperation(value = "支付") @PostMapping(value = "/payOrder") @SneakyThrows @Log(title = "采购管理-支付", businessType = BusinessType.UPDATE) public R<?> payOrder(@RequestParam String id, String type, HttpServletRequest request) { try { @@ -469,6 +472,7 @@ @ApiOperation(value = "退款") @PostMapping(value = "/refundOrder") @SneakyThrows @Log(title = "采购管理-退款", businessType = BusinessType.UPDATE) public synchronized R<?> refundOrder(@RequestParam String id, HttpServletRequest request) { SysUser user = tokenService.getLoginUser().getUser(); try { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BaseModel; import com.ruoyi.common.core.domain.BasePage; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.ExchangeGoodsDto; import com.ruoyi.system.dto.TErpGoodsUpdateStatusDto; @@ -119,6 +121,7 @@ @ApiOperation(value = "添加积分商品--供应商") @PostMapping(value = "/add") @Log(title = "积分商品管理-添加积分商品", businessType = BusinessType.INSERT) public R<String> add(@RequestBody TSysGoods goods) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -145,6 +148,7 @@ @ApiOperation(value = "编辑积分商品--供应商") @PostMapping(value = "/update") @Log(title = "积分商品管理-编辑积分商品", businessType = BusinessType.UPDATE) public R<String> update(@RequestBody TSysGoods goods) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -174,6 +178,7 @@ @ApiOperation(value = "删除积分商品--供应商") @DeleteMapping(value = "/delete/{id}") @Log(title = "积分商品管理-删除积分商品", businessType = BusinessType.DELETE) public R<String> delete(@PathVariable String id) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -200,6 +205,7 @@ @ApiOperation(value = "积分商品 上下架--供应商") @PostMapping(value = "/updateStatus") @Log(title = "积分商品管理-上下架积分商品", businessType = BusinessType.UPDATE) public R<String> updateStatus(@RequestBody @Valid TErpGoodsUpdateStatusDto dto) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); @@ -251,6 +257,7 @@ // 获取兑换记录 @ApiOperation(value = "发货--供应商") @PostMapping(value = "/sendGoods") @Log(title = "积分商品管理-发货", businessType = BusinessType.UPDATE) public R<?> sendGoods(@RequestBody @Valid TSysGoodsExchange exchange) { TSysGoodsExchange exchange1 = sysGoodsExchangeService.getById(exchange.getId()); if (exchange1.getStatus() == 2) { @@ -328,6 +335,7 @@ */ @ApiOperation(value = "兑换商品--诊所") @PostMapping(value = "/exchangeGoods") @Log(title = "积分商品管理-诊所兑换商品", businessType = BusinessType.INSERT) public R<?> exchangeGoods(@RequestBody @Valid ExchangeGoodsDto dto) { SysUser user = tokenService.getLoginUser().getUser(); Integer roleType = user.getRoleType(); ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
@@ -13,6 +13,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; /** * <p> * erp商品 ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
@@ -38,6 +38,10 @@ @ApiModelProperty(value = "商品条码") private String goodsIdCode; @ApiModelProperty(value = "是否为处方药 1=是 2=否") private Integer isPrescriptionDrug; @ApiModelProperty(value = "批次号") private String batchNumber;
@@ -198,6 +198,7 @@ t3.packing_unit_id, t3.quasi_number, t3.goods_id_code, t3.is_prescription_drug, t1.batch_number, coalesce(sum(t5.outbound_count),0) as outbound_count, t1.warehousing_number,
