xuhy
2025-12-24 5ffba96854d35b4413b8d4f98886aae414f162bb
Merge remote-tracking branch 'origin/master'
2个文件已修改
9 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -5,6 +5,7 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -494,6 +495,12 @@
        return R.ok(b);
    }
    public static void main(String[] args) {
        String s = SecureUtil.md5("cca19Broker@.!142536cca");
        System.out.println(s);
    }
    @ApiOperation(value = "供应商完善商品")
    @PostMapping(value = "/saveDataInfo")
    @Log(title = "商品管理-供应商完善商品", businessType = BusinessType.UPDATE)
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -417,7 +417,7 @@
            erpClinicWarehousingBatchService.save(tErpClinicWarehousingGoods);
            if(erpGoods.getMaintenanceInterval()!=null){
            if(erpGoods.getMaintenanceInterval()!=null && !erpGoods.getMaintenanceInterval().isEmpty()){
                TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
                tErpMaintenanceReminder.setClinicSupplierId(clinicSupplierId);
                tErpMaintenanceReminder.setMaintenanceType(2);