fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

liding

6 天以前 3bf81c083883d4861d53380423ee8a44c899b5f6

 src/main/java/com/ruoyi/stock/controller/StockInRecordController.java

@@ -6,11 +6,11 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

@@ -32,12 +32,18 @@
        return AjaxResult.success(result);
    }


    @PostMapping("/editStockInStock")
    @PreAuthorize("@ss.hasPermi('receipt_edit')")
    @ApiOperation("编辑入库记录")
    public AjaxResult editStockInStock(@RequestBody StockInRecordDto stockInRecordDto) {
       return AjaxResult.success(stockInRecordService.editStockInStock(stockInRecordDto));
    }

    @DeleteMapping("")
    @PreAuthorize("@ss.hasPermi('receipt_cancel')")
    @Log(title = "入库管理-删除入库", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)){
        if (CollectionUtils.isEmpty(ids)) {
            return AjaxResult.error("请选择至少一条数据");
        }
        return AjaxResult.success(stockInRecordService.batchDelete(ids));
@@ -46,7 +52,7 @@
    @PostMapping("/exportStockInRecord")
    @ApiOperation("导出入库记录")
    public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
        stockInRecordService.exportStockInRecord(response,stockInRecordDto);
        stockInRecordService.exportStockInRecord(response, stockInRecordDto);
    }

}