ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -233,6 +233,7 @@ goods.setPackingSpec(dto.getPackingSpec()); goods.setGoodsName(dto.getGoodsName()); goods.setIsPrescriptionDrug(null); goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec()); return R.ok(erpGoodsService.save(goods)); } @ApiOperation(value = "诊所添加商品") @@ -259,6 +260,7 @@ } goods.setCreateId(user.getUserId().toString()); goods.setGoodsIdCode(dto.getGoodsIdCode()); goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec()); // goods.setClinicPurchasePrice(dto.getSalesAmount()); if(goods.getIsPrescriptionDrug()!=null && goods.getIsPrescriptionDrug()==3){ goods.setIsPrescriptionDrug(null); ruoyi-system/src/main/resources/mapper/system/TErpClinicWarehousingMapper.xml
@@ -119,7 +119,7 @@ and t1.goods_source =1 and t1.supplier_clinic_id =#{query.supplierClinicId} </if> <if test="user.roleType != null and user.roleType == 5"> and ( ( t1.goods_source =2 and t1.supplier_clinic_id =#{query.supplierClinicId} ) or find_in_set(#{query.supplierClinicId},t1.clinic_ids) ) and ( ( t4.clinic_id =#{query.supplierClinicId} ) or find_in_set(#{query.supplierClinicId},t1.clinic_ids) ) </if> GROUP BY t1.id ) o where 1=1 ruoyi-system/src/main/resources/mapper/system/TErpMaintenanceReminderMapper.xml
@@ -68,7 +68,7 @@ t1.maintenance_person_id, t1.maintenance_time, t1.`status`, t3.warehouse_no t3.warehouse_no,t1.success_time as successTime from t_erp_maintenance_reminder t1 LEFT JOIN t_erp_clinic_warehousing_batch t2 on t1.warehousing_batch_id = t2.id left join t_erp_clinic_warehousing t3 on t2.warehousing_id = t3.id
