kangwei: 解决药剂结算、权限问题

@@ -5,6 +5,7 @@ import java.util.List;
 import com.skua.modules.erp.entity.ErpSettlementItem;
 import com.skua.modules.erp.entity.ErpSettlementItem;
 import com.skua.modules.erp.vo.ErpSettlementItemVO;
 import com.skua.modules.erp.vo.ErpSettlementItemVO;
 import com.skua.modules.erp.vo.ErpSettlementVO;
 import com.skua.modules.erp.vo.ErpSettlementVO;
+import com.skua.tool.annotation.Anonymous;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import com.skua.modules.erp.entity.ErpSettlement;
 import com.skua.modules.erp.entity.ErpSettlement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,9 +20,11 @@ public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> {
     List<ErpSettlementVO> checkSettlementByWaterDepart(@Param("ids")String ids);
     List<ErpSettlementVO> checkSettlementByWaterDepart(@Param("ids")String ids);
 
 
     // 根据入库单ids，获取【供应商】结算单详情
     // 根据入库单ids，获取【供应商】结算单详情
+    @Anonymous
     List<ErpSettlementItemVO> querySupplierSettlementByMaterialIds(@Param("ids") String materialIds);
     List<ErpSettlementItemVO> querySupplierSettlementByMaterialIds(@Param("ids") String materialIds);
 
 
     // 根据入库单ids，获取【水厂】结算单详情
     // 根据入库单ids，获取【水厂】结算单详情
+    @Anonymous
     List<ErpSettlementItemVO> queryWaterDepartSettlementByMaterialIds(@Param("ids") String materialIds);
     List<ErpSettlementItemVO> queryWaterDepartSettlementByMaterialIds(@Param("ids") String materialIds);
     //（供应商）送货单以及物资验收单
     //（供应商）送货单以及物资验收单
    /// List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);
    /// List<ErpSettlementItemVO> querySupplierSettlementFormById(@Param("id")String id);

@@ -266,7 +266,7 @@ public class EquipmentSparepartSuppliesController {
         if (equipmentSparepartSuppliesEntity == null) {
         if (equipmentSparepartSuppliesEntity == null) {
             result.error500("未找到对应实体");
             result.error500("未找到对应实体");
         } else {
         } else {
-            boolean ok = equipmentSparepartSuppliesService.updateById(equipmentSparepartSupplies);
+            boolean ok = equipmentSparepartSuppliesService.updateEquipmentSparepartSupplies(equipmentSparepartSupplies);
             //TODO 返回false说明什么？
             //TODO 返回false说明什么？
             if (ok) {
             if (ok) {
                 result.success("修改成功!");
                 result.success("修改成功!");

@@ -20,4 +20,10 @@ public interface EquipmentSparepartSuppliesMapper extends BaseMapper<EquipmentSp
      */
      */
     public IPage<EquipmentSparepartSupplies> selectPageByOut(Page<EquipmentSparepartSupplies> page,@Param("sparepartName")String sparepartName,
     public IPage<EquipmentSparepartSupplies> selectPageByOut(Page<EquipmentSparepartSupplies> page,@Param("sparepartName")String sparepartName,
                                                             @Param("sparepartType")String sparepartType ,@Param("sparepartCode")String sparepartCode, @Param("applyYear")Integer applyYear);
                                                             @Param("sparepartType")String sparepartType ,@Param("sparepartCode")String sparepartCode, @Param("applyYear")Integer applyYear);
+
+    /***
+     * 级联修改备品备件表
+     * @param equipmentSparepartSupplies
+     */
+    public void updateEquipmentSparepart(EquipmentSparepartSupplies equipmentSparepartSupplies);
 }
 }

@@ -24,4 +24,11 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+    <update id="updateEquipmentSparepart">
+          update  equipment_sparepart set sparepart_code = #{sparepartCode},sparepart_name=#{sparepartName},sparepart_type=#{sparepartType},sparepart_img =#{sparepartImg},specification =#{specification},measuring_unit =#{measuringUnit},
+           sparepart_attribute=#{sparepartAttribute}
+           where supplies_id = #{id}
+
+    </update>
 </mapper>
 </mapper>

@@ -12,8 +12,10 @@ public interface IEquipmentSparepartSuppliesService extends IService<EquipmentSp
     /***
     /***
      * 物料列表+去年出库
      * 物料列表+去年出库
      * @param page
      * @param page
-     * @param depId
+     * @param
      * @return
      * @return
      */
      */
     public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page, String sparepartName,String sparepartType ,String sparepartCode ,Integer applyYear);
     public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page, String sparepartName,String sparepartType ,String sparepartCode ,Integer applyYear);
+
+    boolean updateEquipmentSparepartSupplies(EquipmentSparepartSupplies equipmentSparepartSupplies);
 }
 }

@@ -8,12 +8,15 @@ import com.skua.modules.supplies.service.IEquipmentSparepartSuppliesService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
 /**
  * 物料信息表
  * 物料信息表
  */
  */
 @Service
 @Service
 public class EquipmentSparepartSuppliesServiceImpl extends ServiceImpl<EquipmentSparepartSuppliesMapper, EquipmentSparepartSupplies> implements IEquipmentSparepartSuppliesService {
 public class EquipmentSparepartSuppliesServiceImpl extends ServiceImpl<EquipmentSparepartSuppliesMapper, EquipmentSparepartSupplies> implements IEquipmentSparepartSuppliesService {
+
+
     /***
     /***
      * 物料列表+去年出库
      * 物料列表+去年出库
      * @param page
      * @param page
@@ -23,4 +26,12 @@ public class EquipmentSparepartSuppliesServiceImpl extends ServiceImpl<Equipment
     public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page ,String sparepartName,String sparepartType ,String sparepartCode,Integer applyYear){
     public IPage<EquipmentSparepartSupplies> queryPageByOut(Page<EquipmentSparepartSupplies> page ,String sparepartName,String sparepartType ,String sparepartCode,Integer applyYear){
         return baseMapper.selectPageByOut(page ,sparepartName,sparepartType,sparepartCode,applyYear);
         return baseMapper.selectPageByOut(page ,sparepartName,sparepartType,sparepartCode,applyYear);
     }
     }
+
+    @Transactional
+    public   boolean updateEquipmentSparepartSupplies(EquipmentSparepartSupplies equipmentSparepartSupplies){
+        this.baseMapper.updateById(equipmentSparepartSupplies);
+        //级联修改备品备件表
+        this.baseMapper.updateEquipmentSparepart(equipmentSparepartSupplies);
+        return true;
+    }
 }
 }