kangwei：合同、入库、结算审批都增加消息推送提醒功能

        移动端也需要添加

@@ -256,7 +256,7 @@ public class ErpSettlementController {
 		if(erpSettlementEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
-			boolean ok = erpSettlementService.updateById(erpSettlementEntity);
+			boolean ok = erpSettlementService.auditAccept(erpSettlementEntity);
 			if(ok) {
 				result.success("验收审批成功!");
 			}

@@ -293,7 +293,8 @@ public class MaterialINController {
 			}else{
 				materialIN.setAuditStatus("1");//提交审核
 				materialIN.setApplyUser(BaseContextHandler.getUserId());
-				materialINService.updateById(materialIN);
+				//materialINService.updateById(materialIN);
+				materialINService.sendAudit(materialIN);
 			}
 		} catch (Exception e) {
 			log.error("送审失败",e.getMessage());

@@ -250,7 +250,9 @@ public class 	PurchaseContractController {
 				purchaseContract.setStatus("1");
 				purchaseContract.setApplyUser(BaseContextHandler.getUserId());
 				purchaseContract.setApplyTime(DateUtils.now());
-				purchaseContractService.updateById(purchaseContract);
+				//purchaseContractService.updateById(purchaseContract);
+
+				purchaseContractService.sendAudit(purchaseContract);
 				result.setResult(purchaseContract);
 				result.setSuccess(true);
 			}

@@ -39,4 +39,6 @@ public interface MaterialINMapper extends BaseMapper<MaterialIN> {
      * @return
      */
     public int batchSendAudit(@Param("id")String ids, @Param("auditStatus")String auditStatus);
+
+
 }

@@ -99,4 +99,10 @@ public interface IERPPurchaseContractService extends IService<ERPPurchaseContrac
      * @return
      */
     List<String> selectIdsByCode(String contractCode);
+
+    /***
+     * 送审
+     * @param purchaseContract
+     */
+    void sendAudit(PurchaseContractVO purchaseContract);
 }

@@ -46,6 +46,13 @@ public interface IErpSettlementService extends IService<ErpSettlement> {
     /***结算:修改 药剂入库结算状态*/
     boolean updateMaterialInSettlementFlag(ErpSettlement erpSettlementEntity,String settlementFlag);
 
+    /**
+     * 结算单：验收审批
+     * @param erpSettlementEntity
+     * @return
+     */
+    boolean auditAccept(ErpSettlement erpSettlementEntity);
+
     // （供应商）送货单以及物资验收单
    // ErpSettlementFormVO querySupplierSettlementFormById(String id);
     //（水厂） 送货单以及物资验收单

@@ -64,4 +64,10 @@ public interface IMaterialINService extends IService<MaterialIN> {
      * @return
      */
     public int  batchSendAudit(String ids,String auditStatus);
+
+    /**
+     *
+     * @param materialIN
+     */
+    void sendAudit(MaterialIN materialIN);
 }

@@ -13,6 +13,8 @@ import com.skua.modules.erp.vo.MaterialSearchVO;
 import com.skua.modules.erp.vo.PurchaseContractVO;
 import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.quartz.util.BaseUtil;
+import com.skua.modules.system.service.ISysConfigService;
+import com.skua.modules.system.service.SmsService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +41,10 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
 
     @Autowired
     private IEquipmentInService equipmentInService;
+    @Autowired
+    private SmsService smsService;
+    @Autowired
+    private ISysConfigService configService;
 
 
     /***
@@ -277,6 +283,17 @@ public class ERPPurchaseContractServiceImpl extends ServiceImpl<ERPPurchaseContr
     public List<String> selectIdsByCode(String contractCode){
         return this.baseMapper.selectIdsByCode(contractCode);
     }
+    /***
+     * 送审
+     * @param purchaseContract
+     */
+    @Transactional
+    public void sendAudit(PurchaseContractVO purchaseContract){
+        this.baseMapper.updateById(purchaseContract);
+        //发送信息
+        String roleId = configService.queryValueByKey("TGHT_SP_ROLE_ID");
+        smsService.pushMsgNoProcessByRoleId("统购合同审批","有统购合同["+purchaseContract.getContractName()+"]需要审批审批",roleId,"PurchaseContract");
+    }
 
     /***
      * 同步入库

@@ -16,6 +16,8 @@ import com.skua.modules.erp.vo.ErpSettlementVO;
 import com.skua.modules.erp.vo.SparepartSettlementVO;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.mapper.SysDepartMapper;
+import com.skua.modules.system.service.ISysConfigService;
+import com.skua.modules.system.service.SmsService;
 import com.skua.tool.util.JSUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +47,11 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
     private SupplierManageMapper supplierManageMapper;
     @Autowired
     private SysDepartMapper departMapper ;
+
+    @Autowired
+    private SmsService smsService;
+    @Autowired
+    private ISysConfigService configService;
     /**
      * 新增结算单
      * @param erpSettlementVO
@@ -60,6 +67,18 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
         }
         //修改药剂入库的状态
         updateMaterialInSettlementFlag( erpSettlementVO,"1");
+        //发送消息
+       // settlementType;结算类型：0 供应商结算，1 水厂结算
+        String msgTitle = "药剂结算验收审批";
+        if("0".equals( erpSettlementVO.getSettlementType() )){
+            msgTitle = "供应商结算验收审批";
+        }
+        if("1".equals( erpSettlementVO.getSettlementType() )){
+            msgTitle = "水厂结算验收审批";
+        }
+        //发送信息
+        String roleId = configService.queryValueByKey("YJJS_YS_ROLE_ID");
+        smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement");
     }
 
     /**
@@ -147,7 +166,28 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
     public List<ErpSettlementVO> checkSettlementByWaterDepart(String materialInIds){
         return  this.baseMapper.checkSettlementByWaterDepart( materialInIds );
     }
-
+    /**
+     * 结算单：验收审批
+     * @param erpSettlementEntity
+     * @return
+     */
+    public  boolean auditAccept(ErpSettlement erpSettlementEntity){
+          this.baseMapper.updateById( erpSettlementEntity );
+        //发送信息
+        String roleId = configService.queryValueByKey("YJJS_JLSP_ROLE_ID");
+        //发送消息
+        // settlementType;结算类型：0 供应商结算，1 水厂结算
+        String msgTitle = "药剂结算经理审批";
+        if("0".equals( erpSettlementEntity.getSettlementType() )){
+            msgTitle = "供应商结算经理审批";
+        }
+        if("1".equals( erpSettlementEntity.getSettlementType() )){
+            msgTitle = "水厂结算经理审批";
+        }
+        //发送信息
+        smsService.pushMsgNoProcessByRoleId(msgTitle,msgTitle,roleId,"ErpSettlement");
+        return true;
+    }
 
     //修改药剂入库的结算状态
     public  boolean updateMaterialInSettlementFlag(ErpSettlement erpSettlementEntity,String settlementFlag){

@@ -28,6 +28,8 @@ import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.supplies.entity.PurchaseContract;
 import com.skua.modules.supplies.entity.SuppliesWarehouse;
 import com.skua.modules.supplies.service.ISuppliesWarehouseService;
+import com.skua.modules.system.service.ISysConfigService;
+import com.skua.modules.system.service.SmsService;
 import com.skua.tool.util.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.service.spi.ServiceException;
@@ -53,19 +55,19 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
     private ApproveRecordMapper recordMapper;
     @Autowired
     private IERPPurchaseContractService  purchaseContractService;
-
     @Autowired
     private IPurchaseMaterialService  purchaseMaterialService;
     @Autowired
     private IEquipmentInService equipmentInService;
     @Autowired
     private IEquipmentOutService equipmentOutService;
-    @Autowired
-    private ISuppliesWarehouseService warehouseService;
+
     @Autowired
     private IMaterialAcceptanceFormService materialAcceptanceFormService;//验收单
     @Autowired
-    private ICommonSqlService  commonSqlService;
+    private SmsService smsService;
+    @Autowired
+    private ISysConfigService configService;
 
 
     /***
@@ -91,9 +93,25 @@ public class MaterialINServiceImpl extends ServiceImpl<MaterialINMapper, Materia
      * @param ids
      * @return
      */
+    @Transactional
     public int  batchSendAudit(String ids,String auditStatus){
+
+        //发送信息
+        String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID");
+        smsService.pushMsgNoProcessByRoleId("药剂入库审批","有多个药剂入库需要审批审批",roleId,"MaterialIN");
         return this.baseMapper.batchSendAudit(ids,auditStatus);
     }
+    /**
+     *
+     * @param materialIN
+     */
+    @Transactional
+    public void sendAudit(MaterialIN materialIN){
+        this.baseMapper.updateById(materialIN);
+        //发送信息
+        String roleId = configService.queryValueByKey("YJRK_SP_ROLE_ID");
+        smsService.pushMsgNoProcessByRoleId("药剂入库审批","有药剂入库单["+materialIN.getProjectName()+"]需要审批审批",roleId,"MaterialIN");
+    }
     /***
      * 审核药剂入库单
      * @param materialINVO