Merge remote-tracking branch 'origin/master'

xuhy

2025-10-27 d347fe9660e8acde29d5c4ab190eef08c7266ffa

Merge remote-tracking branch 'origin/master'

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java

@@ -259,6 +259,9 @@
        goods.setCreateId(user.getUserId().toString());
        goods.setGoodsIdCode(dto.getGoodsIdCode());
//        goods.setClinicPurchasePrice(dto.getSalesAmount());
        if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){
            goods.setIsPrescriptionDrug(null);
        }
        return R.ok(erpGoodsService.save(goods));
    }

@@ -284,6 +287,9 @@
        goods.setGoodsIdCode(dto.getGoodsIdCode());
        goods.setId(dto.getId());
        goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec());
        if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){
            goods.setIsPrescriptionDrug(null);
        }
        return R.ok(erpGoodsService.updateById(goods));
    }

@@ -426,7 +432,9 @@
            }

        }

        if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){
            goods.setIsPrescriptionDrug(null);
        }

        return R.ok(erpGoodsService.updateById(goods));
    }