kangwei: 统购与分销后合同扩展导入模版、批量新增功能

@@ -25,7 +25,7 @@ public class DistributContractTempServiceImpl extends ServiceImpl<DistributContr
         JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
         JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
         //# 插入到分销合同表
         //# 插入到分销合同表
         String sql = "insert into  erp_distribut_contract(id,depart_id,project_name,contract_name,apply_user,purchase_time,contract_year, contract_code,status,start_time,end_time,create_time)";
         String sql = "insert into  erp_distribut_contract(id,depart_id,project_name,contract_name,apply_user,purchase_time,contract_year, contract_code,status,start_time,end_time,create_time)";
-        sql +="select id,"+ BaseContextHandler.getRealDepartId() +",project_name,contract_name,apply_user,DATE_FORMAT(purchase_time, '%Y-%m-%d'),contract_year, contract_code,status,DATE_FORMAT(start_time, '%Y-%m-%d %H:%i:%s'),DATE_FORMAT(end_time, '%Y-%m-%d %H:%i:%s')  ,now()  from erp_distribut_contract_temp";
+        sql +="select id,'af880d6a13404a67825e94bc0f2f3808',project_name,contract_name,apply_user,DATE_FORMAT(purchase_time, '%Y-%m-%d'),contract_year, contract_code,status,DATE_FORMAT(start_time, '%Y-%m-%d %H:%i:%s'),DATE_FORMAT(end_time, '%Y-%m-%d %H:%i:%s')  ,now()  from erp_distribut_contract_temp";
         sql +=" where id in (select min(id) from erp_distribut_contract_temp group by  contract_code )";
         sql +=" where id in (select min(id) from erp_distribut_contract_temp group by  contract_code )";
         masterDB.execute(sql);
         masterDB.execute(sql);
         //# 修改状态
         //# 修改状态

@@ -52,8 +52,8 @@ public class PurchaseContractTempServiceImpl extends ServiceImpl<PurchaseContrac
 
 
         masterDB.update( sql );
         masterDB.update( sql );
         //# 供应商编号
         //# 供应商编号
-        sql ="update  erp_purchase_material pm, purchase_supplier ps ";
-        sql+= " set pm.supplier_id = ps.id  where pm.supplier_id = ps.supplier_name";
+        sql ="update  erp_purchase_material pm, ajh_supplier_manage sm ";
+        sql+= " set pm.supplier_id = sm.id   where pm.supplier_id = sm.supp_name";
         masterDB.update( sql );
         masterDB.update( sql );
         //删除数据库表记录
         //删除数据库表记录
         sql = "delete from erp_purchase_contract_temp";
         sql = "delete from erp_purchase_contract_temp";